openstack
/
charm-ceilometer
Code Issues Proposed changes

Remove precise check for not-always-present mongodb replset relation data; Accomodate for ceilometer-agent-central process name differences on Liberty.

This commit is contained in:
Ryan Beisner 2015-10-20 03:13:07 +00:00
parent c73480dc81
commit 1a89ecf462
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/basic_deployment.py
View File

@ -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)