openstack/charm-nova-compute
Code Issues Proposed changes

Deploy both nova-compute and nova-cc from source for amulet git tests.

Browse Source
This commit is contained in:
Corey Bryant 2015-07-21 18:02:54 +00:00
parent f2bfd96e57
commit 4a0f220a0a
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/basic_deployment.py
View File

@ -69,13 +69,16 @@ class NovaBasicDeployment(OpenStackAmuletDeployment):
"""Configure all of the services.""" """Configure all of the services."""
nova_config = {'config-flags': 'auto_assign_floating_ip=False', nova_config = {'config-flags': 'auto_assign_floating_ip=False',
'enable-live-migration': 'False'} 'enable-live-migration': 'False'}
nova_cc_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()
@ -85,6 +88,9 @@ class NovaBasicDeployment(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},
@ -94,10 +100,12 @@ class NovaBasicDeployment(OpenStackAmuletDeployment):
'https_proxy': amulet_http_proxy, 'https_proxy': amulet_http_proxy,
} }
nova_config['openstack-origin-git'] = yaml.dump(openstack_origin_git) nova_config['openstack-origin-git'] = yaml.dump(openstack_origin_git)
nova_cc_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-compute': nova_config, 'keystone': keystone_config} configs = {'nova-compute': nova_config, 'keystone': keystone_config,
'nova-cloud-controller': nova_cc_config}
super(NovaBasicDeployment, self)._configure_services(configs) super(NovaBasicDeployment, self)._configure_services(configs)
def _initialize_tests(self): def _initialize_tests(self):