Sync charm-helpers

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

@@ -109,7 +109,7 @@ class OpenStackAmuletDeployment(AmuletDeployment):
         # Must be ordered by OpenStack release (not by Ubuntu release):
         (self.precise_essex, self.precise_folsom, self.precise_grizzly,
          self.precise_havana, self.precise_icehouse,
-         self.trusty_icehouse, self.trusty_juno, self.utopic_juno, 
+         self.trusty_icehouse, self.trusty_juno, self.utopic_juno,
          self.trusty_kilo, self.vivid_kilo) = range(10)
 
         releases = {

hooks/charmhelpers/contrib/openstack/utils.py

@@ -517,6 +517,7 @@ def git_clone_and_install(projects_yaml, core_project):
     """
     global requirements_dir
     parent_dir = '/mnt/openstack-git'
+    http_proxy = None
 
     if not projects_yaml:
         return
@@ -527,6 +528,7 @@ def git_clone_and_install(projects_yaml, core_project):
     old_environ = dict(os.environ)
 
     if 'http_proxy' in projects.keys():
+        http_proxy = projects['http_proxy']
         os.environ['http_proxy'] = projects['http_proxy']
     if 'https_proxy' in projects.keys():
         os.environ['https_proxy'] = projects['https_proxy']
@@ -539,10 +541,12 @@ def git_clone_and_install(projects_yaml, core_project):
         branch = p['branch']
         if p['name'] == 'requirements':
             repo_dir = _git_clone_and_install_single(repo, branch, parent_dir,
+                                                     http_proxy,
                                                      update_requirements=False)
             requirements_dir = repo_dir
         else:
             repo_dir = _git_clone_and_install_single(repo, branch, parent_dir,
+                                                     http_proxy,
                                                      update_requirements=True)
 
     os.environ = old_environ
@@ -574,7 +578,8 @@ def _git_ensure_key_exists(key, keys):
         error_out('openstack-origin-git key \'{}\' is missing'.format(key))
 
 
-def _git_clone_and_install_single(repo, branch, parent_dir, update_requirements):
+def _git_clone_and_install_single(repo, branch, parent_dir, http_proxy,
+                                  update_requirements):
     """
     Clone and install a single git repository.
     """
@@ -598,7 +603,10 @@ def _git_clone_and_install_single(repo, branch, parent_dir, update_requirements)
         _git_update_requirements(repo_dir, requirements_dir)
 
     juju_log('Installing git repo from dir: {}'.format(repo_dir))
-    pip_install(repo_dir)
+    if http_proxy:
+        pip_install(repo_dir, ignore=True, proxy=http_proxy)
+    else:
+        pip_install(repo_dir, ignore=True)
 
     return repo_dir
 

hooks/charmhelpers/contrib/python/packages.py

@@ -51,17 +51,20 @@ def pip_install_requirements(requirements, **options):
     pip_execute(command)
 
 
-def pip_install(package, fatal=False, upgrade=False, **options):
+def pip_install(package, fatal=False, upgrade=False, ignore=False, **options):
     """Install a python package"""
     command = ["install"]
 
-    available_options = ('proxy', 'src', 'log', "index-url", )
+    available_options = ('proxy', 'src', 'log', 'index-url', )
     for option in parse_options(options, available_options):
         command.append(option)
 
     if upgrade:
         command.append('--upgrade')
 
+    if ignore:
+        command.append('--ignore-installed')
+
     if isinstance(package, list):
         command.extend(package)
     else:

tests/charmhelpers/contrib/amulet/utils.py

@@ -89,7 +89,11 @@ class AmuletUtils(object):
     def _get_config(self, unit, filename):
         """Get a ConfigParser object for parsing a unit's config file."""
         file_contents = unit.file_contents(filename)
-        config = ConfigParser.ConfigParser()
+
+        # NOTE(beisner):  by default, ConfigParser does not handle options
+        # with no value, such as the flags used in the mysql my.cnf file.
+        # https://bugs.python.org/issue7005
+        config = ConfigParser.ConfigParser(allow_no_value=True)
         config.readfp(io.StringIO(file_contents))
         return config