diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-10 18:21:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-10 18:21:05 +0000 |
| commit | bce62b3da9c69a7a4f6ea33116261f853e1c9c26 (patch) | |
| tree | 67e2385982056f5329bfbefb432386166ec24227 | |
| parent | 396df9fca59c18a59629d1b822b6cdd7eb87aec1 (diff) | |
| parent | 5ed97cd4c433e7185195e615e954489acf201ae5 (diff) | |
| download | trove-integration-bce62b3da9c69a7a4f6ea33116261f853e1c9c26.tar.gz | |
Merge "Fix redstack (devstack changes broke ceilometer)"
| -rw-r--r-- | scripts/local.conf.d/ceilometer_cinder.conf.rc | 3 | ||||
| -rw-r--r-- | scripts/local.conf.d/ceilometer_nova.conf.rc | 3 | ||||
| -rw-r--r-- | scripts/local.conf.d/ceilometer_services.conf.rc (renamed from scripts/local.conf.d/ceilometer.conf.rc) | 0 | ||||
| -rw-r--r-- | scripts/localrc.rc | 5 | ||||
| -rw-r--r-- | scripts/redstack.rc | 11 |
5 files changed, 15 insertions, 7 deletions
diff --git a/scripts/local.conf.d/ceilometer_cinder.conf.rc b/scripts/local.conf.d/ceilometer_cinder.conf.rc new file mode 100644 index 0000000..9b80b6c --- /dev/null +++ b/scripts/local.conf.d/ceilometer_cinder.conf.rc @@ -0,0 +1,3 @@ +[[post-config|\$CINDER_CONF]] +[DEFAULT] +notification_driver = messagingv2 diff --git a/scripts/local.conf.d/ceilometer_nova.conf.rc b/scripts/local.conf.d/ceilometer_nova.conf.rc new file mode 100644 index 0000000..fe48b02 --- /dev/null +++ b/scripts/local.conf.d/ceilometer_nova.conf.rc @@ -0,0 +1,3 @@ +[[post-config|\$NOVA_CONF]] +[DEFAULT] +instance_usage_audit = True diff --git a/scripts/local.conf.d/ceilometer.conf.rc b/scripts/local.conf.d/ceilometer_services.conf.rc index ce33948..ce33948 100644 --- a/scripts/local.conf.d/ceilometer.conf.rc +++ b/scripts/local.conf.d/ceilometer_services.conf.rc diff --git a/scripts/localrc.rc b/scripts/localrc.rc index a56f382..30ee636 100644 --- a/scripts/localrc.rc +++ b/scripts/localrc.rc @@ -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 diff --git a/scripts/redstack.rc b/scripts/redstack.rc index 440547a..2fbf12f 100644 --- a/scripts/redstack.rc +++ b/scripts/redstack.rc @@ -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 |