Browse code
Merge "Add ability to enable OSprofiler"
Jenkins authored on 2014/07/03 15:34:21Showing 1 changed files
| ... | ... |
@@ -53,6 +53,9 @@ CEILOMETER_SERVICE_PROTOCOL=http |
| 53 | 53 |
CEILOMETER_SERVICE_HOST=$SERVICE_HOST |
| 54 | 54 |
CEILOMETER_SERVICE_PORT=${CEILOMETER_SERVICE_PORT:-8777}
|
| 55 | 55 |
|
| 56 |
+# To enable OSprofiler change value of this variable to "notifications,profiler" |
|
| 57 |
+CEILOMETER_NOTIFICATION_TOPICS=${CEILOMETER_NOTIFICATION_TOPICS:-notifications}
|
|
| 58 |
+ |
|
| 56 | 59 |
# Tell Tempest this project is present |
| 57 | 60 |
TEMPEST_SERVICES+=,ceilometer |
| 58 | 61 |
|
| ... | ... |
@@ -141,7 +144,7 @@ function configure_ceilometer {
|
| 141 | 141 |
|
| 142 | 142 |
iniset_rpc_backend ceilometer $CEILOMETER_CONF DEFAULT |
| 143 | 143 |
|
| 144 |
- iniset $CEILOMETER_CONF DEFAULT notification_topics 'notifications' |
|
| 144 |
+ iniset $CEILOMETER_CONF DEFAULT notification_topics "$CEILOMETER_NOTIFICATION_TOPICS" |
|
| 145 | 145 |
iniset $CEILOMETER_CONF DEFAULT verbose True |
| 146 | 146 |
iniset $CEILOMETER_CONF DEFAULT debug "$ENABLE_DEBUG_LOG_LEVEL" |
| 147 | 147 |
|