Browse Source

[gnuoy,trivial] Pre-release charmhelper sync

changes/98/286798/1
Liam Young 7 years ago
parent
commit
d5a9882b2f
  1. 2
      hooks/charmhelpers/contrib/openstack/amulet/deployment.py
  2. 6
      tests/charmhelpers/contrib/amulet/utils.py

2
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 = {

6
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

Loading…
Cancel
Save