openstack/trove-integration
Code Issues Proposed changes

Fix redstack (devstack changes broke ceilometer)

Browse Source 
A recent commit in devstack (https://review.openstack.org/#/c/219207 )
now validates that all post-processed conf files specified in local.conf
exist.

We need to conditionally add the ceilometer.conf to this file, since it
may or may not be present.

Enabling Ceilometer was also broken, as it's now a member of the 'big
tent' so this was fixed as well

Two additional options were added to enable ceilometer notifications in
Nova and Cinder.  These can be activated by setting the following on
the command line or in options.rc (or ~/.redstack.options.rc).

CEILOMETER_NOVA_CONF=True
CEILOMETER_CINDER_CONF=True

Change-Id: I4181d751a1c35b581c7d56e157324d04c4ddec6b
Closes-Bug: #1513515
This commit is contained in:
Peter Stachowski 2015-11-05 16:51:05 +00:00
parent 031da8a7d0
commit 5ed97cd4c4
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/local.conf.d/ceilometer_cinder.conf.rc Normal file
View File

@ -0,0 +1,3 @@
[[post-config|\$CINDER_CONF]]
[DEFAULT]
notification_driver = messagingv2

3
scripts/local.conf.d/ceilometer_nova.conf.rc Normal file
View File

@ -0,0 +1,3 @@
[[post-config|\$NOVA_CONF]]
[DEFAULT]
instance_usage_audit = True

0
scripts/local.conf.d/ceilometer.conf.rc → scripts/local.conf.d/ceilometer_services.conf.rc
View File

5
scripts/localrc.rc
View File

@ -27,10 +27,7 @@ fi
if [[ $ENABLE_CEILOMETER = true ]] || [[ $ENABLE_PROFILER = true ]]; then
CEILOMETER_BACKEND=mysql
CEILOMETER_NOTIFICATION_TOPICS=notifications,profiler
ENABLED_SERVICES+=,ceilometer-acompute,ceilometer-acentral
ENABLED_SERVICES+=,ceilometer-anotification,ceilometer-collector
ENABLED_SERVICES+=,ceilometer-alarm-evaluator,ceilometer-alarm-notifier
ENABLED_SERVICES+=,ceilometer-api
enable_plugin ceilometer ${GIT_OPENSTACK}/ceilometer.git
fi
# Use Git repositories for client components

11
scripts/redstack.rc
View File

@ -9,14 +9,14 @@
# Enable neutron instead of nova-network
ENABLE_NEUTRON=$(get_bool ENABLE_NEUTRON false)
# Enable ceilometer
ENABLE_CEILOMETER=$(get_bool ENABLE_CEILOMETER false)
# Enable osprofiler - note: Enables Ceilometer as well
ENABLE_PROFILER=$(get_bool ENABLE_PROFILER false)
PROFILER_TRACE_SQL=$(get_bool PROFILER_TRACE_SQL false)
[ -z $PROFILER_HMAC_KEYS ] && PROFILER_HMAC_KEYS=SECRET_KEY
# Enable ceilometer
ENABLE_CEILOMETER=$(get_bool ENABLE_CEILOMETER $ENABLE_PROFILER)
# Enable LIBS_FROM_GIT
LIBS_FROM_GIT_ALL_CLIENTS=$(get_bool LIBS_FROM_GIT_ALL_CLIENTS false)
LIBS_FROM_GIT_ALL_OSLO=$(get_bool LIBS_FROM_GIT_ALL_OSLO false)
@ -25,6 +25,11 @@ LIBS_FROM_GIT_ALL_OSLO=$(get_bool LIBS_FROM_GIT_ALL_OSLO false)
USING_VAGRANT=$(get_bool USING_VAGRANT false)
USE_UUID_TOKEN=$(get_bool USE_UUID_TOKEN false)
# Specify configuration for Ceilometer
CEILOMETER_SERVICES_CONF=$(get_bool CEILOMETER_SERVICES_CONF $ENABLE_CEILOMETER)
CEILOMETER_CINDER_CONF=$(get_bool CEILOMETER_CINDER_CONF false)
CEILOMETER_NOVA_CONF=$(get_bool CEILOMETER_NOVA_CONF false)
# Paths for various OpenStack components
PATH_DEVSTACK_OUTPUT=$DEST
PATH_NOVA=$DEST/nova