diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-07 08:54:23 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-07 22:31:06 -0700 |
| commit | b84abb9425afebddf0109ecb36e383c2a228b5a8 (patch) | |
| tree | 6fcf21f2759e10df5845c1ba88639b9a6690ca00 /docker/common/ceilometer/ceilometer-compute | |
| parent | 115bc899665a6c63cdcb429df36ffa86af1eb22c (diff) | |
| download | kolla-b84abb9425afebddf0109ecb36e383c2a228b5a8.tar.gz kolla-b84abb9425afebddf0109ecb36e383c2a228b5a8.zip | |
Remove config-internal from ceilometer
Change-Id: I273c91d1300c1b30f7263195657e3510975f6f50
Partially-Implements: blueprint remove-config-internal
Diffstat (limited to 'docker/common/ceilometer/ceilometer-compute')
| -rwxr-xr-x | docker/common/ceilometer/ceilometer-compute/config-internal.sh | 27 | ||||
| -rwxr-xr-x | docker/common/ceilometer/ceilometer-compute/start.sh | 2 |
2 files changed, 1 insertions, 28 deletions
diff --git a/docker/common/ceilometer/ceilometer-compute/config-internal.sh b/docker/common/ceilometer/ceilometer-compute/config-internal.sh deleted file mode 100755 index 633fa6183..000000000 --- a/docker/common/ceilometer/ceilometer-compute/config-internal.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -. /opt/kolla/kolla-common.sh -. /opt/kolla/config-ceilometer.sh - - -check_required_vars KEYSTONE_ADMIN_TOKEN \ - RABBITMQ_SERVICE_HOST \ - RABBIT_PASSWORD - -fail_unless_os_service_running keystone - -# Nova conf settings -crudini --set /etc/nova/nova.conf DEFAULT instance_usage_audit True -crudini --set /etc/nova/nova.conf DEFAULT instance_usage_audit_period hour -crudini --set /etc/nova/nova.conf DEFAULT notify_on_state_change vm_and_task_state -crudini --set /etc/nova/nova.conf DEFAULT notification_driver nova.openstack.common.notifier.rpc_notifier -crudini --set /etc/nova/nova.conf DEFAULT notification_driver ceilometer.compute.nova_notifier - -#ceilometer settings -cfg=/etc/ceilometer/ceilometer.conf -crudini --set $cfg publisher_rpc metering_secret ${KEYSTONE_ADMIN_TOKEN} -crudini --set $cfg rabbit_host ${RABBITMQ_SERVICE_HOST} -crudini --set $cfg rabbit_password ${RABBIT_PASSWORD} - - -exec /usr/bin/ceilometer-agent-compute diff --git a/docker/common/ceilometer/ceilometer-compute/start.sh b/docker/common/ceilometer/ceilometer-compute/start.sh index dff79dd1b..19d90be2f 100755 --- a/docker/common/ceilometer/ceilometer-compute/start.sh +++ b/docker/common/ceilometer/ceilometer-compute/start.sh @@ -8,7 +8,7 @@ ARGS="" # Loading common functions. source /opt/kolla/kolla-common.sh -# Config-internal script exec out of this function, it does not return here. +# Execute config strategy set_configs exec $CMD $ARGS |