From 6af99cda91f14667a811aafcb6acbbbf77ad5de0 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Thu, 23 Apr 2015 15:56:34 +0100 Subject: [PATCH 1/4] [gnuoy,trivial] Pre-release charmhelper sync --- hooks/charmhelpers/contrib/openstack/amulet/deployment.py | 2 +- tests/charmhelpers/contrib/amulet/utils.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hooks/charmhelpers/contrib/openstack/amulet/deployment.py b/hooks/charmhelpers/contrib/openstack/amulet/deployment.py index 4538e961..461a702f 100644 --- a/hooks/charmhelpers/contrib/openstack/amulet/deployment.py +++ b/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 = { diff --git a/tests/charmhelpers/contrib/amulet/utils.py b/tests/charmhelpers/contrib/amulet/utils.py index 58233714..f61c2e8b 100644 --- a/tests/charmhelpers/contrib/amulet/utils.py +++ b/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 From 5c91c34de7fe337f8a569f782888d70064699fb8 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Fri, 24 Apr 2015 14:07:56 +0000 Subject: [PATCH 2/4] [corey.bryant,trivial] Fix deploy from source README --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 05d08869..1d272d9d 100644 --- a/README.md +++ b/README.md @@ -46,8 +46,8 @@ These compute nodes could then be accessed by cloud users via use of host aggreg The minimum openstack-origin-git config required to deploy from source is: - openstack-origin-git: - "repositories: + openstack-origin-git: + "repositories: - {name: requirements, repository: 'git://git.openstack.org/openstack/requirements', branch: stable/juno} @@ -63,8 +63,8 @@ in the order in which they are specified. The following is a full list of current tip repos (may not be up-to-date): - openstack-origin-git: - "repositories: + openstack-origin-git: + "repositories: - {name: requirements, repository: 'git://git.openstack.org/openstack/requirements', branch: master} From 295f98888aaf0b62bfe6ca3d016e7ef433379b9d Mon Sep 17 00:00:00 2001 From: Edward Hope-Morley Date: Thu, 30 Apr 2015 12:02:58 +0200 Subject: [PATCH 3/4] [trivial] fix templates/os-charm-phy-nic-mtu.conf description --- templates/os-charm-phy-nic-mtu.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/os-charm-phy-nic-mtu.conf b/templates/os-charm-phy-nic-mtu.conf index 06d1967b..edbb2588 100644 --- a/templates/os-charm-phy-nic-mtu.conf +++ b/templates/os-charm-phy-nic-mtu.conf @@ -1,4 +1,4 @@ -description "Enabling Quantum external networking port" +description "Apply MTU for Neutron data ports" start on runlevel [2345] @@ -19,4 +19,4 @@ script rm $tmpfile [ $rc = 0 ] || exit $rc fi -end script \ No newline at end of file +end script From bea91211f708cfc70bb36b4d31416fa5f5f08748 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Thu, 30 Apr 2015 12:09:23 +0000 Subject: [PATCH 4/4] [corey.bryant,trivial] Update deploy from source README samples. --- README.md | 150 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 77 insertions(+), 73 deletions(-) diff --git a/README.md b/README.md index 1d272d9d..e88bf414 100644 --- a/README.md +++ b/README.md @@ -46,14 +46,16 @@ These compute nodes could then be accessed by cloud users via use of host aggreg The minimum openstack-origin-git config required to deploy from source is: - openstack-origin-git: - "repositories: - - {name: requirements, - repository: 'git://git.openstack.org/openstack/requirements', - branch: stable/juno} - - {name: neutron, - repository: 'git://git.openstack.org/openstack/neutron', - branch: stable/juno}" + openstack-origin-git: include-file://neutron-juno.yaml + + neutron-juno.yaml + repositories: + - {name: requirements, + repository: 'git://github.com/openstack/requirements', + branch: stable/juno} + - {name: neutron, + repository: 'git://github.com/openstack/neutron', + branch: stable/juno} Note that there are only two 'name' values the charm knows about: 'requirements' and 'neutron'. These repositories must correspond to these 'name' values. @@ -63,68 +65,70 @@ in the order in which they are specified. The following is a full list of current tip repos (may not be up-to-date): - openstack-origin-git: - "repositories: - - {name: requirements, - repository: 'git://git.openstack.org/openstack/requirements', - branch: master} - - {name: oslo-concurrency, - repository: 'git://git.openstack.org/openstack/oslo.concurrency', - branch: master} - - {name: oslo-config, - repository: 'git://git.openstack.org/openstack/oslo.config', - branch: master} - - {name: oslo-context, - repository: 'git://git.openstack.org/openstack/oslo.context.git', - branch: master} - - {name: oslo-db, - repository: 'git://git.openstack.org/openstack/oslo.db', - branch: master} - - {name: oslo-i18n, - repository: 'git://git.openstack.org/openstack/oslo.i18n', - branch: master} - - {name: oslo-messaging, - repository: 'git://git.openstack.org/openstack/oslo.messaging.git', - branch: master} - - {name: oslo-middleware, - repository': 'git://git.openstack.org/openstack/oslo.middleware.git', - branch: master} - - {name: oslo-rootwrap', - repository: 'git://git.openstack.org/openstack/oslo.rootwrap.git', - branch: master} - - {name: oslo-serialization, - repository: 'git://git.openstack.org/openstack/oslo.serialization', - branch: master} - - {name: oslo-utils, - repository: 'git://git.openstack.org/openstack/oslo.utils', - branch: master} - - {name: pbr, - repository: 'git://git.openstack.org/openstack-dev/pbr', - branch: master} - - {name: stevedore, - repository: 'git://git.openstack.org/openstack/stevedore.git', - branch: 'master'} - - {name: python-keystoneclient, - repository: 'git://git.openstack.org/openstack/python-keystoneclient', - branch: master} - - {name: python-neutronclient, - repository: 'git://git.openstack.org/openstack/python-neutronclient.git', - branch: master} - - {name: python-novaclient, - repository': 'git://git.openstack.org/openstack/python-novaclient.git', - branch: master} - - {name: keystonemiddleware, - repository: 'git://git.openstack.org/openstack/keystonemiddleware', - branch: master} - - {name: neutron-fwaas, - repository': 'git://git.openstack.org/openstack/neutron-fwaas.git', - branch: master} - - {name: neutron-lbaas, - repository: 'git://git.openstack.org/openstack/neutron-lbaas.git', - branch: master} - - {name: neutron-vpnaas, - repository: 'git://git.openstack.org/openstack/neutron-vpnaas.git', - branch: master} - - {name: neutron, - repository: 'git://git.openstack.org/openstack/neutron', - branch: master}" + openstack-origin-git: include-file://neutron-master.yaml + + neutron-master.yaml + repositories: + - {name: requirements, + repository: 'git://github.com/openstack/requirements', + branch: master} + - {name: oslo-concurrency, + repository: 'git://github.com/openstack/oslo.concurrency', + branch: master} + - {name: oslo-config, + repository: 'git://github.com/openstack/oslo.config', + branch: master} + - {name: oslo-context, + repository: 'git://github.com/openstack/oslo.context', + branch: master} + - {name: oslo-db, + repository: 'git://github.com/openstack/oslo.db', + branch: master} + - {name: oslo-i18n, + repository: 'git://github.com/openstack/oslo.i18n', + branch: master} + - {name: oslo-messaging, + repository: 'git://github.com/openstack/oslo.messaging', + branch: master} + - {name: oslo-middleware, + repository': 'git://github.com/openstack/oslo.middleware', + branch: master} + - {name: oslo-rootwrap', + repository: 'git://github.com/openstack/oslo.rootwrap', + branch: master} + - {name: oslo-serialization, + repository: 'git://github.com/openstack/oslo.serialization', + branch: master} + - {name: oslo-utils, + repository: 'git://github.com/openstack/oslo.utils', + branch: master} + - {name: pbr, + repository: 'git://github.com/openstack-dev/pbr', + branch: master} + - {name: stevedore, + repository: 'git://github.com/openstack/stevedore', + branch: 'master'} + - {name: python-keystoneclient, + repository: 'git://github.com/openstack/python-keystoneclient', + branch: master} + - {name: python-neutronclient, + repository: 'git://github.com/openstack/python-neutronclient', + branch: master} + - {name: python-novaclient, + repository': 'git://github.com/openstack/python-novaclient', + branch: master} + - {name: keystonemiddleware, + repository: 'git://github.com/openstack/keystonemiddleware', + branch: master} + - {name: neutron-fwaas, + repository': 'git://github.com/openstack/neutron-fwaas', + branch: master} + - {name: neutron-lbaas, + repository: 'git://github.com/openstack/neutron-lbaas', + branch: master} + - {name: neutron-vpnaas, + repository: 'git://github.com/openstack/neutron-vpnaas', + branch: master} + - {name: neutron, + repository: 'git://github.com/openstack/neutron', + branch: master}