From 1a89ecf462fabad235dd795b754c4625a00a3137 Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Tue, 20 Oct 2015 03:13:07 +0000 Subject: [PATCH] Remove precise check for not-always-present mongodb replset relation data; Accomodate for ceilometer-agent-central process name differences on Liberty. --- tests/basic_deployment.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index c13668f..ff9c76c 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -377,9 +377,6 @@ class CeilometerBasicDeployment(OpenStackAmuletDeployment): 'type': 'database', } - if self._get_openstack_release() == self.precise_icehouse: - expected['replset'] = 'myset' - ret = u.validate_relation_data(unit, relation, expected) if ret: message = u.relation_error('mongodb database', ret) @@ -622,7 +619,6 @@ class CeilometerBasicDeployment(OpenStackAmuletDeployment): # and corresponding config files affected by the change conf_file = '/etc/ceilometer/ceilometer.conf' services = { - 'ceilometer-agent-central': conf_file, 'ceilometer-collector': conf_file, 'ceilometer-api': conf_file, 'ceilometer-alarm-evaluator': conf_file, @@ -630,6 +626,14 @@ class CeilometerBasicDeployment(OpenStackAmuletDeployment): 'ceilometer-agent-notification': conf_file, } + if self._get_openstack_release() == self.trusty_liberty or \ + self._get_openstack_release() >= self.wily_liberty: + # Liberty and later + services['ceilometer-polling'] = conf_file + else: + # Juno and earlier + services['ceilometer-agent-central'] = conf_file + # Make config change, check for service restarts u.log.debug('Making config change on {}...'.format(juju_service)) mtime = u.get_sentry_time(sentry)