auto sync charmhelpers

hooks/charmhelpers/contrib/openstack/amulet/deployment.py

@@ -101,7 +101,8 @@ class OpenStackAmuletDeployment(AmuletDeployment):
            """
         (self.precise_essex, self.precise_folsom, self.precise_grizzly,
          self.precise_havana, self.precise_icehouse,
-         self.trusty_icehouse, self.trusty_juno, self.trusty_kilo) = range(8)
+         self.trusty_icehouse, self.trusty_juno, self.trusty_kilo,
+         self.utopic_juno, self.vivid_kilo) = range(10)
         releases = {
             ('precise', None): self.precise_essex,
             ('precise', 'cloud:precise-folsom'): self.precise_folsom,
@@ -110,7 +111,9 @@ class OpenStackAmuletDeployment(AmuletDeployment):
             ('precise', 'cloud:precise-icehouse'): self.precise_icehouse,
             ('trusty', None): self.trusty_icehouse,
             ('trusty', 'cloud:trusty-juno'): self.trusty_juno,
-            ('trusty', 'cloud:trusty-kilo'): self.trusty_kilo}
+            ('trusty', 'cloud:trusty-kilo'): self.trusty_kilo,
+            ('utopic', None): self.utopic_juno,
+            ('vivid', None): self.vivid_kilo}
         return releases[(self.series, self.openstack)]
 
     def _get_openstack_release_string(self):

hooks/charmhelpers/contrib/openstack/context.py

@@ -459,6 +459,11 @@ class AMQPContext(OSContextGenerator):
 
                 ctxt['rabbitmq_hosts'] = ','.join(sorted(rabbitmq_hosts))
 
+        oslo_messaging_flags = conf.get('oslo-messaging-flags', None)
+        if oslo_messaging_flags:
+            ctxt['oslo_messaging_flags'] = config_flags_parser(
+                oslo_messaging_flags)
+
         if not context_complete(ctxt):
             return {}
 

hooks/charmhelpers/contrib/openstack/utils.py

@@ -524,9 +524,10 @@ def git_clone_and_install(projects_yaml, core_project):
     projects = yaml.load(projects_yaml)
     _git_validate_projects_yaml(projects, core_project)
 
+    old_environ = dict(os.environ)
+
     if 'http_proxy' in projects.keys():
         os.environ['http_proxy'] = projects['http_proxy']
-
     if 'https_proxy' in projects.keys():
         os.environ['https_proxy'] = projects['https_proxy']
 
@@ -544,6 +545,8 @@ def git_clone_and_install(projects_yaml, core_project):
             repo_dir = _git_clone_and_install_single(repo, branch, parent_dir,
                                                      update_requirements=True)
 
+    os.environ = old_environ
+
 
 def _git_validate_projects_yaml(projects, core_project):
     """

tests/charmhelpers/contrib/openstack/amulet/deployment.py

@@ -101,7 +101,8 @@ class OpenStackAmuletDeployment(AmuletDeployment):
            """
         (self.precise_essex, self.precise_folsom, self.precise_grizzly,
          self.precise_havana, self.precise_icehouse,
-         self.trusty_icehouse, self.trusty_juno, self.trusty_kilo) = range(8)
+         self.trusty_icehouse, self.trusty_juno, self.trusty_kilo,
+         self.utopic_juno, self.vivid_kilo) = range(10)
         releases = {
             ('precise', None): self.precise_essex,
             ('precise', 'cloud:precise-folsom'): self.precise_folsom,
@@ -110,7 +111,9 @@ class OpenStackAmuletDeployment(AmuletDeployment):
             ('precise', 'cloud:precise-icehouse'): self.precise_icehouse,
             ('trusty', None): self.trusty_icehouse,
             ('trusty', 'cloud:trusty-juno'): self.trusty_juno,
-            ('trusty', 'cloud:trusty-kilo'): self.trusty_kilo}
+            ('trusty', 'cloud:trusty-kilo'): self.trusty_kilo,
+            ('utopic', None): self.utopic_juno,
+            ('vivid', None): self.vivid_kilo}
         return releases[(self.series, self.openstack)]
 
     def _get_openstack_release_string(self):