diff options
| author | Swapnil Kulkarni <me@coolsvap.net> | 2015-07-03 06:14:29 +0000 |
|---|---|---|
| committer | Swapnil Kulkarni <me@coolsvap.net> | 2015-07-09 12:13:25 -0400 |
| commit | 4c25113d30ae951e7d3a2f23fa5758e62ead8a8f (patch) | |
| tree | 2ecdbe5341be0cdd4b0678b7ecc13d37e4b9c57d /docker/common/ceilometer/ceilometer-compute | |
| parent | fcda6a06d8eee9d3f3199962b36a04a8c702072c (diff) | |
| download | kolla-4c25113d30ae951e7d3a2f23fa5758e62ead8a8f.tar.gz kolla-4c25113d30ae951e7d3a2f23fa5758e62ead8a8f.zip | |
Add config-internal/config-external for Ceilometer
Partially Implements: Blueprint standard-start
Change-Id: I0c9fea2014a23ca0b08f9a0946472cc877edacbc
Diffstat (limited to 'docker/common/ceilometer/ceilometer-compute')
3 files changed, 43 insertions, 19 deletions
diff --git a/docker/common/ceilometer/ceilometer-compute/config-external.sh b/docker/common/ceilometer/ceilometer-compute/config-external.sh new file mode 100644 index 000000000..2835bd5aa --- /dev/null +++ b/docker/common/ceilometer/ceilometer-compute/config-external.sh @@ -0,0 +1,10 @@ +#!/bin/bash +SOURCE="/opt/kolla/ceilometer/ceilometer.conf" +TARGET="/etc/ceilometer/ceilometer.conf" +OWNER="ceilometer" + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET +fi diff --git a/docker/common/ceilometer/ceilometer-compute/config-internal.sh b/docker/common/ceilometer/ceilometer-compute/config-internal.sh new file mode 100644 index 000000000..f4fc30bae --- /dev/null +++ b/docker/common/ceilometer/ceilometer-compute/config-internal.sh @@ -0,0 +1,25 @@ +#!/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 f4fc30bae..dff79dd1b 100644 --- a/docker/common/ceilometer/ceilometer-compute/start.sh +++ b/docker/common/ceilometer/ceilometer-compute/start.sh @@ -1,25 +1,14 @@ #!/bin/bash -. /opt/kolla/kolla-common.sh -. /opt/kolla/config-ceilometer.sh +set -o errexit +CMD="/usr/bin/ceilometer-agent-compute" +ARGS="" -check_required_vars KEYSTONE_ADMIN_TOKEN RABBITMQ_SERVICE_HOST RABBIT_PASSWORD +# Loading common functions. +source /opt/kolla/kolla-common.sh -fail_unless_os_service_running keystone +# Config-internal script exec out of this function, it does not return here. +set_configs -# 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 +exec $CMD $ARGS |