Fixes bug where tiller always passes 'wait'

-Fixes wait bug
-Updates tiller and hapi to 2.5

armada/handlers/armada.py

@@ -111,12 +111,12 @@ class Armada(object):
                       release[1])
 
         for entry in self.config['armada']['charts']:
-
+            chart_wait = self.wait
             desc = entry.get('description', 'A Chart Group')
             chart_group = entry.get('chart_group', [])
 
             if entry.get('sequenced', False):
-                self.wait = True
+                chart_wait = True
 
             LOG.info('Deploying: %s', desc)
 
@@ -132,7 +132,7 @@ class Armada(object):
 
                 # retrieve appropriate timeout value if 'wait' is specified
                 chart_timeout = None
-                if self.wait:
+                if chart_wait:
                     if getattr(chart, 'timeout', None):
                         chart_timeout = chart.timeout
                     else:
@@ -191,7 +191,7 @@ class Armada(object):
                                                disable_hooks=chart.
                                                upgrade.no_hooks,
                                                values=yaml.safe_dump(values),
-                                               wait=self.wait,
+                                               wait=chart_wait,
                                                timeout=chart_timeout)
 
                 # process install
@@ -203,7 +203,7 @@ class Armada(object):
                                                 chart.namespace,
                                                 prefix,
                                                 values=yaml.safe_dump(values),
-                                                wait=self.wait,
+                                                wait=chart_wait,
                                                 timeout=chart_timeout)
 
                 LOG.debug("Cleaning up chart source in %s",

armada/handlers/tiller.py

@@ -25,7 +25,7 @@ from oslo_config import cfg
 from oslo_log import log as logging
 
 TILLER_PORT = 44134
-TILLER_VERSION = b'2.4.2'
+TILLER_VERSION = b'2.5.0'
 TILLER_TIMEOUT = 300
 RELEASE_LIMIT = 64
 
@@ -188,6 +188,8 @@ class Tiller(object):
         '''
         Update a Helm Release
         '''
+        LOG.debug("wait: %s", wait)
+        LOG.debug("timeout: %s", timeout)
 
         if values is None:
             values = Config(raw='')
@@ -217,6 +219,8 @@ class Tiller(object):
         '''
         Create a Helm Release
         '''
+        LOG.debug("wait: %s", wait)
+        LOG.debug("timeout: %s", timeout)
 
         if values is None:
             values = Config(raw='')

tools/helm-hapi.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-git clone https://github.com/kubernetes/helm ./helm -b release-$1
+git clone https://github.com/kubernetes/helm ./helm -b $1
 
 python -m grpc_tools.protoc -I helm/_proto --python_out=. --grpc_python_out=. helm/_proto/hapi/chart/*
 python -m grpc_tools.protoc -I helm/_proto --python_out=. --grpc_python_out=. helm/_proto/hapi/services/*