diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-11-12 19:43:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-11-12 19:43:33 +0000 |
| commit | b57caa7b67ed1747c7046afa41d1cbbee5802b69 (patch) | |
| tree | a23c0c087cdefb25d4d074f939eaf5522e95dab7 /docker/ceilometer/ceilometer-base | |
| parent | c569335e800735099e3ae1b3ef7c35f020ee1c3c (diff) | |
| parent | aed78804ef9c87931d61a8036bcfa229704ae0e6 (diff) | |
| download | kolla-b57caa7b67ed1747c7046afa41d1cbbee5802b69.tar.gz kolla-b57caa7b67ed1747c7046afa41d1cbbee5802b69.zip | |
Merge "Add Ceilometer service support"
Diffstat (limited to 'docker/ceilometer/ceilometer-base')
| -rw-r--r-- | docker/ceilometer/ceilometer-base/Dockerfile | 5 | ||||
| l--------- | docker/ceilometer/ceilometer-base/build | 1 | ||||
| -rw-r--r-- | docker/ceilometer/ceilometer-base/config-ceilometer.sh | 69 |
3 files changed, 75 insertions, 0 deletions
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile b/docker/ceilometer/ceilometer-base/Dockerfile new file mode 100644 index 000000000..c166027cd --- /dev/null +++ b/docker/ceilometer/ceilometer-base/Dockerfile @@ -0,0 +1,5 @@ +FROM kollaglue/fedora-rdo-base +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +RUN mkdir -p /opt/kolla +COPY config-ceilometer.sh /opt/kolla/config-ceilometer.sh diff --git a/docker/ceilometer/ceilometer-base/build b/docker/ceilometer/ceilometer-base/build new file mode 120000 index 000000000..43944faa0 --- /dev/null +++ b/docker/ceilometer/ceilometer-base/build @@ -0,0 +1 @@ +../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/ceilometer/ceilometer-base/config-ceilometer.sh b/docker/ceilometer/ceilometer-base/config-ceilometer.sh new file mode 100644 index 000000000..64008ab8b --- /dev/null +++ b/docker/ceilometer/ceilometer-base/config-ceilometer.sh @@ -0,0 +1,69 @@ +#!/bin/sh + +set -e +. /opt/kolla/kolla-common.sh + +: ${CEILOMETER_DB_USER:=ceilometer} +: ${CEILOMETER_DB_NAME:=ceilometer} +: ${KEYSTONE_AUTH_PROTOCOL:=http} +: ${CEILOMETER_KEYSTONE_USER:=admin} +: ${CEILOMETER_ADMIN_PASSWORD:=kolla} +: ${ADMIN_TENANT_NAME:=admin} +: ${METERING_SECRET:=ceilometer} + +check_required_vars CEILOMETER_DB_PASSWORD KEYSTONE_ADMIN_TOKEN DB_ROOT_PASSWORD +dump_vars + +cat > /openrc <<EOF +export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" +export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/v2.0" +EOF + + +cfg=/etc/ceilometer/ceilometer.conf + +crudini --set $cfg \ + DEFAULT rpc_backend rabbit +crudini --set $cfg \ + DEFAULT rabbit_host ${KEYSTONE_SERVICE_HOST} +crudini --set $cfg \ + DEFAULT rabbit_password ${RABBITMQ_PASS} + +crudini --set $cfg \ + keystone_authtoken \ + auth_uri \ + "http://${KEYSTONE_SERVICE_HOST}:5000/" +crudini --set $cfg \ + keystone_authtoken \ + admin_tenant_name \ + "${ADMIN_TENANT_NAME}" +crudini --set $cfg \ + keystone_authtoken \ + admin_user \ + "${CEILOMETER_KEYSTONE_USER}" +crudini --set $cfg \ + keystone_authtoken \ + admin_password \ + ${CEILOMETER_ADMIN_PASSWORD} + +crudini --set $cfg \ + service_credentials \ + os_auth_url \ + ${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_SERVICE_HOST}:5000/ +crudini --set $cfg \ + service_credentials \ + os_username \ + ceilometer +crudini --set $cfg \ + service_credentials \ + os_tenant_name \ + service +crudini --set $cfg \ + service_credentials \ + os_password \ + ${CEILOMETER_ADMIN_PASSWORD} + +crudini --set $cfg \ + publisher + metering_secret + ${METERING_SECRET} |