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

Merge "Drop nova-cert >= newton"

Browse Source
This commit is contained in:
Jenkins 2017-06-26 14:08:24 +00:00 committed by Gerrit Code Review
commit f185d001a3
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hooks/nova_cc_utils.py
View File

@ -198,7 +198,8 @@ BASE_SERVICES = [
AWS_COMPAT_SERVICES = ['nova-api-ec2', 'nova-objectstore'] AWS_COMPAT_SERVICES = ['nova-api-ec2', 'nova-objectstore']
SERVICE_BLACKLIST = { SERVICE_BLACKLIST = {
'liberty': AWS_COMPAT_SERVICES 'liberty': AWS_COMPAT_SERVICES,
'newton': ['nova-cert'],
} }
API_PORTS = { API_PORTS = {

27
tests/basic_deployment.py
View File

@ -70,8 +70,13 @@ class NovaCCBasicDeployment(OpenStackAmuletDeployment):
self._initialize_tests() self._initialize_tests()
def _assert_services(self, should_run): def _assert_services(self, should_run):
services = ("nova-api-os-compute", "nova-cert", "nova-conductor", services = ["nova-api-os-compute", "nova-cert", "nova-conductor",
"nova-scheduler", "apache2", "haproxy") "nova-scheduler", "apache2", "haproxy"]
cmp_os_release = CompareOpenStackReleases(
self._get_openstack_release_string()
)
if cmp_os_release >= 'newton':
services.remove('nova-cert')
u.get_unit_process_ids( u.get_unit_process_ids(
{self.nova_cc_sentry: services}, {self.nova_cc_sentry: services},
expect_success=should_run) expect_success=should_run)
@ -277,11 +282,16 @@ class NovaCCBasicDeployment(OpenStackAmuletDeployment):
self.keystone_sentry: ['keystone'], self.keystone_sentry: ['keystone'],
self.glance_sentry: ['glance-registry', 'glance-api'] self.glance_sentry: ['glance-registry', 'glance-api']
} }
_os_release = self._get_openstack_release_string() cmp_os_release = CompareOpenStackReleases(
if CompareOpenStackReleases(_os_release) >= 'liberty': self._get_openstack_release_string()
)
if cmp_os_release >= 'liberty':
services[self.nova_cc_sentry].remove('nova-api-ec2') services[self.nova_cc_sentry].remove('nova-api-ec2')
services[self.nova_cc_sentry].remove('nova-objectstore') services[self.nova_cc_sentry].remove('nova-objectstore')
if cmp_os_release >= 'newton':
services[self.nova_cc_sentry].remove('nova-cert')
if self._get_openstack_release() >= self.trusty_liberty: if self._get_openstack_release() >= self.trusty_liberty:
services[self.keystone_sentry] = ['apache2'] services[self.keystone_sentry] = ['apache2']
@ -853,11 +863,16 @@ class NovaCCBasicDeployment(OpenStackAmuletDeployment):
'nova-conductor': conf_file 'nova-conductor': conf_file
} }
_os_release = self._get_openstack_release_string() cmp_os_release = CompareOpenStackReleases(
if CompareOpenStackReleases(_os_release) >= 'liberty': self._get_openstack_release_string()
)
if cmp_os_release >= 'liberty':
del services['nova-api-ec2'] del services['nova-api-ec2']
del services['nova-objectstore'] del services['nova-objectstore']
if cmp_os_release >= 'newton':
del services['nova-cert']
if self._get_openstack_release() >= self.xenial_ocata: if self._get_openstack_release() >= self.xenial_ocata:
# nova-placement-api is run under apache2 with mod_wsgi # nova-placement-api is run under apache2 with mod_wsgi
services['apache2'] = conf_file services['apache2'] = conf_file