summaryrefslogtreecommitdiff
path: root/devstack/lib
diff options
context:
space:
mode:
authorlvdongbing <dongbing.lv@kylin-cloud.com>2016-10-11 05:44:10 -0400
committerlvdongbing <dongbing.lv@kylin-cloud.com>2016-10-11 05:45:43 -0400
commit8fe74c0edcef9547ebdbc5bd67e2724897267811 (patch)
treea98bb9403896a2b798e239089599cfab04e2299c /devstack/lib
parentcaff6c6fa20a2df24502aac800a983a5af586941 (diff)
downloadosprofiler-8fe74c0edcef9547ebdbc5bd67e2724897267811.tar.gz
Heat and Cinder now use new style conf
Change-Id: Ice1952fac512905009a6042e571a10e23e7f62b0
Diffstat (limited to 'devstack/lib')
-rw-r--r--devstack/lib/osprofiler16
1 files changed, 2 insertions, 14 deletions
diff --git a/devstack/lib/osprofiler b/devstack/lib/osprofiler
index b758601..3cd9905 100644
--- a/devstack/lib/osprofiler
+++ b/devstack/lib/osprofiler
@@ -20,12 +20,9 @@ set +o xtrace
# Defaults
# --------
-OLD_STYLE_CONF_FILES=(
+CONF_FILES=(
/etc/cinder/cinder.conf
/etc/heat/heat.conf
-)
-
-NEW_STYLE_CONF_FILES=(
/etc/keystone/keystone.conf
/etc/nova/nova.conf
/etc/neutron/neutron.conf
@@ -47,16 +44,7 @@ export CEILOMETER_NOTIFICATION_TOPICS=notifications,profiler
# configure_osprofiler() - Nothing for now
function configure_osprofiler() {
- for conf in ${OLD_STYLE_CONF_FILES[@]}; do
- if [ -f $conf ]
- then
- iniset $conf profiler profiler_enabled True
- iniset $conf profiler trace_sqlalchemy True
- iniset $conf profiler hmac_keys SECRET_KEY
- fi
- done
-
- for conf in ${NEW_STYLE_CONF_FILES[@]}; do
+ for conf in ${CONF_FILES[@]}; do
if [ -f $conf ]
then
iniset $conf profiler enabled True