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 13:49:07 +00:00
parent 94e36f8f56
commit f0d72e2e24
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/basic_deployment.py
View File

@@ -71,9 +71,9 @@ class NeutronOVSBasicDeployment(OpenStackAmuletDeployment):
release = self._get_openstack_release_string()
reqs_branch = 'stable/' + release
neutron_branch = 'stable/' + release
if self._get_openstack_release() >= self.trusty_kilo:
neutron_branch = 'stable/' + release
openstack_origin_git = {
'repositories': [
{'name': 'requirements',
@@ -99,7 +99,6 @@ class NeutronOVSBasicDeployment(OpenStackAmuletDeployment):
else:
reqs_repo = 'git://github.com/openstack/requirements'
neutron_repo = 'git://github.com/openstack/neutron'
neutron_branch = 'stable/' + release
if self._get_openstack_release() == self.trusty_icehouse:
reqs_repo = 'git://github.com/coreycb/requirements'
neutron_repo = 'git://github.com/coreycb/neutron'