From e8f5341034c574aa07fb587e66c5c47a1d3620f8 Mon Sep 17 00:00:00 2001 From: James Page Date: Wed, 21 Jun 2017 11:59:45 +0100 Subject: [PATCH] Drop nova-cert >= newton nova-cert was deprecated @ newton, and only supports ec2 services which we dropped in the charms @ liberty so remove installation and configuration of this service for >= newton. Change-Id: I6d0ed6a1e058f38cb5d556a34b6f4299bf6d2055 --- hooks/nova_cc_utils.py | 3 ++- tests/basic_deployment.py | 27 +++++++++++++++++++++------ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/hooks/nova_cc_utils.py b/hooks/nova_cc_utils.py index 7ba1d0e5..6fd396e3 100644 --- a/hooks/nova_cc_utils.py +++ b/hooks/nova_cc_utils.py @@ -198,7 +198,8 @@ BASE_SERVICES = [ AWS_COMPAT_SERVICES = ['nova-api-ec2', 'nova-objectstore'] SERVICE_BLACKLIST = { - 'liberty': AWS_COMPAT_SERVICES + 'liberty': AWS_COMPAT_SERVICES, + 'newton': ['nova-cert'], } API_PORTS = { diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 3bcc0931..954c38de 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -70,8 +70,13 @@ class NovaCCBasicDeployment(OpenStackAmuletDeployment): self._initialize_tests() def _assert_services(self, should_run): - services = ("nova-api-os-compute", "nova-cert", "nova-conductor", - "nova-scheduler", "apache2", "haproxy") + services = ["nova-api-os-compute", "nova-cert", "nova-conductor", + "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( {self.nova_cc_sentry: services}, expect_success=should_run) @@ -277,11 +282,16 @@ class NovaCCBasicDeployment(OpenStackAmuletDeployment): self.keystone_sentry: ['keystone'], self.glance_sentry: ['glance-registry', 'glance-api'] } - _os_release = self._get_openstack_release_string() - if CompareOpenStackReleases(_os_release) >= 'liberty': + cmp_os_release = CompareOpenStackReleases( + 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-objectstore') + if cmp_os_release >= 'newton': + services[self.nova_cc_sentry].remove('nova-cert') + if self._get_openstack_release() >= self.trusty_liberty: services[self.keystone_sentry] = ['apache2'] @@ -853,11 +863,16 @@ class NovaCCBasicDeployment(OpenStackAmuletDeployment): 'nova-conductor': conf_file } - _os_release = self._get_openstack_release_string() - if CompareOpenStackReleases(_os_release) >= 'liberty': + cmp_os_release = CompareOpenStackReleases( + self._get_openstack_release_string() + ) + if cmp_os_release >= 'liberty': del services['nova-api-ec2'] del services['nova-objectstore'] + if cmp_os_release >= 'newton': + del services['nova-cert'] + if self._get_openstack_release() >= self.xenial_ocata: # nova-placement-api is run under apache2 with mod_wsgi services['apache2'] = conf_file