openstack
/
charm-ceilometer
Code Issues Proposed changes

Register pipeline conf in quuens+ 

A bug was causing the events yaml from being rendered on quuens+
deploys. This change adds it to the quuens+ configs.

Closes-Bug: 1773355
Change-Id: I309107da609e186638332d3a9bca00a86ccd6010
This commit is contained in:
Liam Young 2018-05-25 12:37:47 +00:00
parent 24c41477d5
commit b64e500f6c
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/ceilometer_utils.py
View File

@ -213,6 +213,7 @@ def register_configs():
if CompareOpenStackReleases(release) >= 'queens':
for conf in QUEENS_CONFIG_FILES:
configs.register(conf, QUEENS_CONFIG_FILES[conf]['hook_contexts'])
configs.register(PIPELINE_CONF, [RemoteSinksContext()])
else:
for conf in (CEILOMETER_CONF, HAPROXY_CONF):
configs.register(conf, CONFIG_FILES[conf]['hook_contexts'])

7
test-requirements.txt
View File

@ -25,3 +25,10 @@ distro-info
# END: Amulet OpenStack Charm Helper Requirements
# NOTE: workaround for 14.04 pip/tox
pytz
# Temporary fix to cmd2 dep issues:
# Root of the issue is a release blunder by a upstream dependency:
# python-cmd2/cmd2#421
# Upstream has made the same change to global requirements here:
# https://review.openstack.org/#/c/570811
# We can remove this again as soon as changes propagate out to all dependencies.
cmd2!=0.8.3,<0.9.0 # MIT