openstack
/
charm-neutron-api
Code Issues Proposed changes

More amulet deploy from source branch fixups.

This commit is contained in:
Corey Bryant 2015-07-13 12:44:41 +00:00
parent 16710cb478
commit 02953ad633
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/basic_deployment.py
View File

@ -107,26 +107,30 @@ class NeutronAPIBasicDeployment(OpenStackAmuletDeployment):
"""Configure all of the services."""
neutron_api_config = {}
if self.git:
branch = 'stable/' + self._get_openstack_release_string()
amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY')
release = self._get_openstack_release_string()
reqs_branch = 'stable/' + release
if self._get_openstack_release() >= self.trusty_kilo:
neutron_branch = 'stable/' + release
openstack_origin_git = {
'repositories': [
{'name': 'requirements',
'repository': 'git://github.com/openstack/requirements',
'branch': branch},
'branch': reqs_branch},
{'name': 'neutron-fwaas',
'repository': 'git://github.com/openstack/neutron-fwaas',
'branch': branch},
'branch': neutron_branch},
{'name': 'neutron-lbaas',
'repository': 'git://github.com/openstack/neutron-lbaas',
'branch': branch},
'branch': neutron_branch},
{'name': 'neutron-vpnaas',
'repository': 'git://github.com/openstack/neutron-vpnaas',
'branch': branch},
'branch': neutron_branch},
{'name': 'neutron',
'repository': 'git://github.com/openstack/neutron',
'branch': branch},
'branch': neutron_branch},
],
'directory': '/mnt/openstack-git',
'http_proxy': amulet_http_proxy,
@ -134,18 +138,20 @@ class NeutronAPIBasicDeployment(OpenStackAmuletDeployment):
}
else:
if self._get_openstack_release() == self.trusty_icehouse:
neutron_branch = release + '-eol'
reqs_repo = 'git://github.com/coreycb/requirements'
else:
neutron_branch = 'stable/' + release
reqs_repo = 'git://github.com/openstack/requirements'
neutron_repo = 'git://github.com/openstack/neutron'
openstack_origin_git = {
'repositories': [
{'name': 'requirements',
'repository': reqs_repo,
'branch': branch},
'branch': neutron_branch},
{'name': 'neutron',
'repository': neutron_repo,
'branch': branch},
'branch': neutron_branch},
],
'directory': '/mnt/openstack-git',
'http_proxy': amulet_http_proxy,