openstack/charm-neutron-openvswitch
Code Issues Proposed changes

Fixup amulet git repos

Browse Source
This commit is contained in:
Corey Bryant
2015-07-12 21:03:27 +00:00
parent 6e75432cff
commit 2ec7b15d57
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/basic_deployment.py
View File

@@ -76,16 +76,16 @@ class NeutronOVSBasicDeployment(OpenStackAmuletDeployment):
'repository': 'git://github.com/openstack/requirements', 'repository': 'git://github.com/openstack/requirements',
'branch': branch}, 'branch': branch},
{'name': 'neutron-fwaas', {'name': 'neutron-fwaas',
'repository': 'git://github.com/coreycb/neutron-fwaas', 'repository': 'git://github.com/openstack/neutron-fwaas',
'branch': branch}, 'branch': branch},
{'name': 'neutron-lbaas', {'name': 'neutron-lbaas',
'repository': 'git://github.com/coreycb/neutron-lbaas', 'repository': 'git://github.com/openstack/neutron-lbaas',
'branch': branch}, 'branch': branch},
{'name': 'neutron-vpnaas', {'name': 'neutron-vpnaas',
'repository': 'git://github.com/coreycb/neutron-vpnaas', 'repository': 'git://github.com/openstack/neutron-vpnaas',
'branch': branch}, 'branch': branch},
{'name': 'neutron', {'name': 'neutron',
'repository': 'git://github.com/coreycb/neutron', 'repository': 'git://github.com/openstack/neutron',
'branch': branch}, 'branch': branch},
], ],
'directory': '/mnt/openstack-git', 'directory': '/mnt/openstack-git',
@@ -93,13 +93,19 @@ class NeutronOVSBasicDeployment(OpenStackAmuletDeployment):
'https_proxy': amulet_http_proxy, 'https_proxy': amulet_http_proxy,
} }
else: else:
if self._get_openstack_release() == self.trusty_icehouse:
reqs_repo = 'git://github.com/coreycb/requirements'
neutron_repo = 'git://github.com/coreycb/neutron'
else:
reqs_repo = 'git://github.com/openstack/requirements'
neutron_repo = 'git://github.com/openstack/neutron'
openstack_origin_git = { openstack_origin_git = {
'repositories': [ 'repositories': [
{'name': 'requirements', {'name': 'requirements',
'repository': 'git://github.com/openstack/requirements', 'repository': reqs_repo,
'branch': branch}, 'branch': branch},
{'name': 'neutron', {'name': 'neutron',
'repository': 'git://github.com/coreycb/neutron', 'repository': neutron_repo,
'branch': branch}, 'branch': branch},
], ],
'directory': '/mnt/openstack-git', 'directory': '/mnt/openstack-git',