openstack
/
charm-ceilometer
Code Issues Proposed changes

Stop checking for ceilometer-agent-central service 

Since Liberty ceilometer-agent-central has been replaced with
ceilometer-polling. There is some confusion there as the package
is still named ceilometer-agent-central.

For OpenStack releases >= Liberty stop checking for the
ceilometer-agent-central service to be running.

TODO for post release: remove the OCF management of the service(s).

Change-Id: I5064ce130da1ec302245aaff5dbe93d9dab63b38
Partial-bug: #1664898
This commit is contained in:
David Ames 2017-02-17 07:42:57 -08:00
parent 76e8859480
commit 5951cbb763
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/ceilometer_hooks.py
View File

@ -226,6 +226,8 @@ def upgrade_charm():
def install_ceilometer_ocf():
# TODO Move away from using the OCF resource for openstack service
# management.
dest_file = LEGACY_OCF_FILE
src_file = 'ocf/openstack/ceilometer-agent-central'

8
lib/ceilometer_utils.py
View File

@ -231,7 +231,13 @@ def services():
_services = []
for v in restart_map().values():
_services = _services + v
return list(set(_services))
_services = set(_services)
# Bug#1664898 Remove check for ceilometer-agent-central
# service.
codename = get_os_codename_install_source(config('openstack-origin'))
if codename >= 'liberty' and 'ceilometer-agent-central' in _services:
_services.remove('ceilometer-agent-central')
return list(_services)
def determine_ports():