openstack/charm-nova-cloud-controller
Code Issues Proposed changes

[corey.bryant,trivial] Deploy nova-cc from source for amulet git tests.

Browse Source
This commit is contained in:
Corey Bryant 2015-07-22 23:02:42 -04:00
parent 9e72c52ecb
commit 18ae4b52af
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/basic_deployment.py
View File

@ -66,14 +66,16 @@ class NovaCCBasicDeployment(OpenStackAmuletDeployment):
def _configure_services(self): def _configure_services(self):
"""Configure all of the services.""" """Configure all of the services."""
nova_cc_config = {} nova_cc_config = nova_config = {}
if self.git: if self.git:
amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY') amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY')
reqs_repo = 'git://github.com/openstack/requirements' reqs_repo = 'git://github.com/openstack/requirements'
neutron_repo = 'git://github.com/openstack/neutron'
nova_repo = 'git://github.com/openstack/nova' nova_repo = 'git://github.com/openstack/nova'
if self._get_openstack_release() == self.trusty_icehouse: if self._get_openstack_release() == self.trusty_icehouse:
reqs_repo = 'git://github.com/coreycb/requirements' reqs_repo = 'git://github.com/coreycb/requirements'
neutron_repo = 'git://github.com/coreycb/neutron'
nova_repo = 'git://github.com/coreycb/nova' nova_repo = 'git://github.com/coreycb/nova'
branch = 'stable/' + self._get_openstack_release_string() branch = 'stable/' + self._get_openstack_release_string()
@ -83,6 +85,9 @@ class NovaCCBasicDeployment(OpenStackAmuletDeployment):
{'name': 'requirements', {'name': 'requirements',
'repository': reqs_repo, 'repository': reqs_repo,
'branch': branch}, 'branch': branch},
{'name': 'neutron',
'repository': neutron_repo,
'branch': branch},
{'name': 'nova', {'name': 'nova',
'repository': nova_repo, 'repository': nova_repo,
'branch': branch}, 'branch': branch},
@ -92,10 +97,11 @@ class NovaCCBasicDeployment(OpenStackAmuletDeployment):
'https_proxy': amulet_http_proxy, 'https_proxy': amulet_http_proxy,
} }
nova_cc_config['openstack-origin-git'] = yaml.dump(openstack_origin_git) nova_cc_config['openstack-origin-git'] = yaml.dump(openstack_origin_git)
nova_config['openstack-origin-git'] = yaml.dump(openstack_origin_git)
keystone_config = {'admin-password': 'openstack', keystone_config = {'admin-password': 'openstack',
'admin-token': 'ubuntutesting'} 'admin-token': 'ubuntutesting'}
configs = {'nova-cloud-controller': nova_cc_config, configs = {'nova-cloud-controller': nova_cc_config,
'keystone': keystone_config} 'keystone': keystone_config, 'nova-compute': nova_config}
super(NovaCCBasicDeployment, self)._configure_services(configs) super(NovaCCBasicDeployment, self)._configure_services(configs)
def _initialize_tests(self): def _initialize_tests(self):