openstack/charm-neutron-openvswitch
Code Issues Proposed changes

More amulet deploy from source branch fixups.

Browse Source
This commit is contained in:
Corey Bryant 2015-07-13 16:07:30 +00:00
parent f0d72e2e24
commit 22f9977691
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/basic_deployment.py
View File

@ -69,28 +69,26 @@ class NeutronOVSBasicDeployment(OpenStackAmuletDeployment):
if self.git: if self.git:
amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY') amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY')
release = self._get_openstack_release_string() branch = 'stable/' + self._get_openstack_release_string()
reqs_branch = 'stable/' + release
neutron_branch = 'stable/' + release
if self._get_openstack_release() >= self.trusty_kilo: if self._get_openstack_release() >= self.trusty_kilo:
openstack_origin_git = { openstack_origin_git = {
'repositories': [ 'repositories': [
{'name': 'requirements', {'name': 'requirements',
'repository': 'git://github.com/openstack/requirements', 'repository': 'git://github.com/openstack/requirements',
'branch': reqs_branch}, 'branch': branch},
{'name': 'neutron-fwaas', {'name': 'neutron-fwaas',
'repository': 'git://github.com/openstack/neutron-fwaas', 'repository': 'git://github.com/openstack/neutron-fwaas',
'branch': neutron_branch}, 'branch': branch},
{'name': 'neutron-lbaas', {'name': 'neutron-lbaas',
'repository': 'git://github.com/openstack/neutron-lbaas', 'repository': 'git://github.com/openstack/neutron-lbaas',
'branch': neutron_branch}, 'branch': branch},
{'name': 'neutron-vpnaas', {'name': 'neutron-vpnaas',
'repository': 'git://github.com/openstack/neutron-vpnaas', 'repository': 'git://github.com/openstack/neutron-vpnaas',
'branch': neutron_branch}, 'branch': branch},
{'name': 'neutron', {'name': 'neutron',
'repository': 'git://github.com/openstack/neutron', 'repository': 'git://github.com/openstack/neutron',
'branch': neutron_branch}, 'branch': branch},
], ],
'directory': '/mnt/openstack-git', 'directory': '/mnt/openstack-git',
'http_proxy': amulet_http_proxy, 'http_proxy': amulet_http_proxy,
@ -107,10 +105,10 @@ class NeutronOVSBasicDeployment(OpenStackAmuletDeployment):
'repositories': [ 'repositories': [
{'name': 'requirements', {'name': 'requirements',
'repository': reqs_repo, 'repository': reqs_repo,
'branch': reqs_branch}, 'branch': branch},
{'name': 'neutron', {'name': 'neutron',
'repository': neutron_repo, 'repository': neutron_repo,
'branch': neutron_branch}, 'branch': branch},
], ],
'directory': '/mnt/openstack-git', 'directory': '/mnt/openstack-git',
'http_proxy': amulet_http_proxy, 'http_proxy': amulet_http_proxy,