diff --git a/docker/centos/binary/ceilometer/ceilometer-alarm/config-internal.sh b/docker/centos/binary/ceilometer/ceilometer-alarm/config-internal.sh deleted file mode 120000 index 0f009e4bec..0000000000 --- a/docker/centos/binary/ceilometer/ceilometer-alarm/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-alarm/config-internal.sh \ No newline at end of file diff --git a/docker/centos/binary/ceilometer/ceilometer-api/config-internal.sh b/docker/centos/binary/ceilometer/ceilometer-api/config-internal.sh deleted file mode 120000 index 589c797ecd..0000000000 --- a/docker/centos/binary/ceilometer/ceilometer-api/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-api/config-internal.sh \ No newline at end of file diff --git a/docker/centos/binary/ceilometer/ceilometer-base/config-ceilometer.sh b/docker/centos/binary/ceilometer/ceilometer-base/config-ceilometer.sh deleted file mode 120000 index 63215435d5..0000000000 --- a/docker/centos/binary/ceilometer/ceilometer-base/config-ceilometer.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-base/config-ceilometer.sh \ No newline at end of file diff --git a/docker/centos/binary/ceilometer/ceilometer-central/config-internal.sh b/docker/centos/binary/ceilometer/ceilometer-central/config-internal.sh deleted file mode 120000 index 86fd40c4aa..0000000000 --- a/docker/centos/binary/ceilometer/ceilometer-central/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-central/config-internal.sh \ No newline at end of file diff --git a/docker/centos/binary/ceilometer/ceilometer-collector/config-internal.sh b/docker/centos/binary/ceilometer/ceilometer-collector/config-internal.sh deleted file mode 120000 index de90be3722..0000000000 --- a/docker/centos/binary/ceilometer/ceilometer-collector/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-collector/config-internal.sh \ No newline at end of file diff --git a/docker/centos/binary/ceilometer/ceilometer-compute/config-internal.sh b/docker/centos/binary/ceilometer/ceilometer-compute/config-internal.sh deleted file mode 120000 index ceefe1a9e7..0000000000 --- a/docker/centos/binary/ceilometer/ceilometer-compute/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-compute/config-internal.sh \ No newline at end of file diff --git a/docker/centos/binary/ceilometer/ceilometer-notification/config-internal.sh b/docker/centos/binary/ceilometer/ceilometer-notification/config-internal.sh deleted file mode 120000 index 75a4ba990e..0000000000 --- a/docker/centos/binary/ceilometer/ceilometer-notification/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-notification/config-internal.sh \ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-alarm/Dockerfile b/docker/centos/source/ceilometer/ceilometer-alarm/Dockerfile index fd640691a8..86cf40d923 100644 --- a/docker/centos/source/ceilometer/ceilometer-alarm/Dockerfile +++ b/docker/centos/source/ceilometer/ceilometer-alarm/Dockerfile @@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY ./start.sh /start.sh -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/ceilometer/ceilometer-alarm/config-internal.sh b/docker/centos/source/ceilometer/ceilometer-alarm/config-internal.sh deleted file mode 120000 index 0f009e4bec..0000000000 --- a/docker/centos/source/ceilometer/ceilometer-alarm/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-alarm/config-internal.sh \ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-api/Dockerfile b/docker/centos/source/ceilometer/ceilometer-api/Dockerfile index 91baaf939c..5db74a0011 100644 --- a/docker/centos/source/ceilometer/ceilometer-api/Dockerfile +++ b/docker/centos/source/ceilometer/ceilometer-api/Dockerfile @@ -2,5 +2,5 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY ./start.sh /start.sh -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/ceilometer/ceilometer-api/config-internal.sh b/docker/centos/source/ceilometer/ceilometer-api/config-internal.sh deleted file mode 120000 index 589c797ecd..0000000000 --- a/docker/centos/source/ceilometer/ceilometer-api/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-api/config-internal.sh \ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-base/Dockerfile b/docker/centos/source/ceilometer/ceilometer-base/Dockerfile index 98d53fc88e..0b4e0e63d1 100644 --- a/docker/centos/source/ceilometer/ceilometer-base/Dockerfile +++ b/docker/centos/source/ceilometer/ceilometer-base/Dockerfile @@ -12,6 +12,4 @@ RUN cd /ceilometer \ && cp -r /ceilometer/etc/* /etc/ceilometer/ \ && rm -rf /root/.cache -COPY config-ceilometer.sh /opt/kolla/ - CMD ["/start.sh"] diff --git a/docker/centos/source/ceilometer/ceilometer-base/config-ceilometer.sh b/docker/centos/source/ceilometer/ceilometer-base/config-ceilometer.sh deleted file mode 120000 index 63215435d5..0000000000 --- a/docker/centos/source/ceilometer/ceilometer-base/config-ceilometer.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-base/config-ceilometer.sh \ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-central/Dockerfile b/docker/centos/source/ceilometer/ceilometer-central/Dockerfile index fd640691a8..86cf40d923 100644 --- a/docker/centos/source/ceilometer/ceilometer-central/Dockerfile +++ b/docker/centos/source/ceilometer/ceilometer-central/Dockerfile @@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY ./start.sh /start.sh -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/ceilometer/ceilometer-central/config-internal.sh b/docker/centos/source/ceilometer/ceilometer-central/config-internal.sh deleted file mode 120000 index 86fd40c4aa..0000000000 --- a/docker/centos/source/ceilometer/ceilometer-central/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-central/config-internal.sh \ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-collector/Dockerfile b/docker/centos/source/ceilometer/ceilometer-collector/Dockerfile index fd640691a8..86cf40d923 100644 --- a/docker/centos/source/ceilometer/ceilometer-collector/Dockerfile +++ b/docker/centos/source/ceilometer/ceilometer-collector/Dockerfile @@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY ./start.sh /start.sh -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/ceilometer/ceilometer-collector/config-internal.sh b/docker/centos/source/ceilometer/ceilometer-collector/config-internal.sh deleted file mode 120000 index de90be3722..0000000000 --- a/docker/centos/source/ceilometer/ceilometer-collector/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-collector/config-internal.sh \ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-compute/Dockerfile b/docker/centos/source/ceilometer/ceilometer-compute/Dockerfile index fd640691a8..86cf40d923 100644 --- a/docker/centos/source/ceilometer/ceilometer-compute/Dockerfile +++ b/docker/centos/source/ceilometer/ceilometer-compute/Dockerfile @@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY ./start.sh /start.sh -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/ceilometer/ceilometer-compute/config-internal.sh b/docker/centos/source/ceilometer/ceilometer-compute/config-internal.sh deleted file mode 120000 index ceefe1a9e7..0000000000 --- a/docker/centos/source/ceilometer/ceilometer-compute/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-compute/config-internal.sh \ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-notification/Dockerfile b/docker/centos/source/ceilometer/ceilometer-notification/Dockerfile index fd640691a8..86cf40d923 100644 --- a/docker/centos/source/ceilometer/ceilometer-notification/Dockerfile +++ b/docker/centos/source/ceilometer/ceilometer-notification/Dockerfile @@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY ./start.sh /start.sh -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/ceilometer/ceilometer-notification/config-internal.sh b/docker/centos/source/ceilometer/ceilometer-notification/config-internal.sh deleted file mode 120000 index 75a4ba990e..0000000000 --- a/docker/centos/source/ceilometer/ceilometer-notification/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-notification/config-internal.sh \ No newline at end of file diff --git a/docker/common/ceilometer/ceilometer-alarm/config-internal.sh b/docker/common/ceilometer/ceilometer-alarm/config-internal.sh deleted file mode 100755 index 7470ae608f..0000000000 --- a/docker/common/ceilometer/ceilometer-alarm/config-internal.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -set -e - -. /opt/kolla/kolla-common.sh -. /opt/kolla/config-ceilometer.sh - - -exec /usr/bin/ceilometer-alarm-evaluator & -exec /usr/bin/ceilometer-alarm-notifier diff --git a/docker/common/ceilometer/ceilometer-alarm/start.sh b/docker/common/ceilometer/ceilometer-alarm/start.sh index cd42a83ef3..ab5501b23d 100755 --- a/docker/common/ceilometer/ceilometer-alarm/start.sh +++ b/docker/common/ceilometer/ceilometer-alarm/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 diff --git a/docker/common/ceilometer/ceilometer-api/config-internal.sh b/docker/common/ceilometer/ceilometer-api/config-internal.sh deleted file mode 100755 index fb34a468f6..0000000000 --- a/docker/common/ceilometer/ceilometer-api/config-internal.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash - -set -e - -. /opt/kolla/kolla-common.sh -. /opt/kolla/config-ceilometer.sh - -check_required_vars ADMIN_TENANT_NAME \ - CEILOMETER_ADMIN_PASSWORD \ - CEILOMETER_API_SERVICE_HOST \ - CEILOMETER_DB_NAME \ - CEILOMETER_DB_PASSWORD \ - CEILOMETER_DB_USER \ - CEILOMETER_KEYSTONE_USER \ - KEYSTONE_ADMIN_SERVICE_HOST \ - KEYSTONE_ADMIN_SERVICE_PORT \ - KEYSTONE_ADMIN_TOKEN \ - KEYSTONE_AUTH_PROTOCOL \ - PUBLIC_IP - - -fail_unless_os_service_running keystone -fail_unless_db - -#TODO(pkilambi): Add mongodb support - -mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF -CREATE DATABASE IF NOT EXISTS ${CEILOMETER_DB_NAME} DEFAULT CHARACTER SET utf8; -GRANT ALL PRIVILEGES ON ${CEILOMETER_DB_NAME}.* TO - '${CEILOMETER_DB_USER}'@'%' IDENTIFIED BY '${CEILOMETER_DB_PASSWORD}' - -EOF - - -export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" -export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/v2.0" - - -crux user-create -n ${CEILOMETER_KEYSTONE_USER} \ - -p ${CEILOMETER_ADMIN_PASSWORD} \ - -t ${ADMIN_TENANT_NAME} \ - -r admin - -crux service-create -n ${CEILOMETER_KEYSTONE_USER} -t metering \ - -d "Ceilometer Telemetry Service" - -crux endpoint-create i--remove-all -n ${CEILOMETER_KEYSTONE_USER} -t metering \ - -I "${KEYSTONE_AUTH_PROTOCOL}://${CEILOMETER_API_SERVICE_HOST}:8777" \ - -P "${KEYSTONE_AUTH_PROTOCOL}://${PUBLIC_IP}:8777" \ - -A "${KEYSTONE_AUTH_PROTOCOL}://${CEILOMETER_API_SERVICE_HOST}:8777" - -cfg=/etc/ceilometer/ceilometer.conf -crudini --set $cfg \ - DEFAULT connection - "mysql://${CEILOMETER_DB_USER}:${CEILOMETER_DB_PASSWORD}@${MARIADB_SERVICE_HOST}/${CEILOMETER_DB_NAME}" - - -exec /usr/bin/ceilometer-api diff --git a/docker/common/ceilometer/ceilometer-base/config-ceilometer.sh b/docker/common/ceilometer/ceilometer-base/config-ceilometer.sh deleted file mode 100644 index f286204564..0000000000 --- a/docker/common/ceilometer/ceilometer-base/config-ceilometer.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash - -set -e -. /opt/kolla/kolla-common.sh - -check_required_vars KEYSTONE_ADMIN_SERVICE_HOST \ - KEYSTONE_ADMIN_SERVICE_PORT \ - KEYSTONE_ADMIN_TOKEN \ - KEYSTONE_PUBLIC_SERVICE_HOST - -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 ${RABBITMQ_SERVICE_HOST} -crudini --set $cfg \ - DEFAULT rabbit_password ${RABBIT_PASSWORD} - -crudini --set $cfg \ - keystone_authtoken \ - auth_uri \ - "http://${KEYSTONE_PUBLIC_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_PUBLIC_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} diff --git a/docker/common/ceilometer/ceilometer-central/config-internal.sh b/docker/common/ceilometer/ceilometer-central/config-internal.sh deleted file mode 100755 index 1cc8d46cf6..0000000000 --- a/docker/common/ceilometer/ceilometer-central/config-internal.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -. /opt/kolla/kolla-common.sh -. /opt/kolla/config-ceilometer.sh - -check_required_vars KEYSTONE_ADMIN_SERVICE_HOST \ - KEYSTONE_ADMIN_SERVICE_PORT \ - KEYSTONE_AUTH_PROTOCOL \ - KEYSTONE_ADMIN_TOKEN - -fail_unless_os_service_running keystone - -export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" -export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/v2.0" - -exec /usr/bin/ceilometer-agent-central diff --git a/docker/common/ceilometer/ceilometer-central/start.sh b/docker/common/ceilometer/ceilometer-central/start.sh index f9c317828a..f2980a4d51 100755 --- a/docker/common/ceilometer/ceilometer-central/start.sh +++ b/docker/common/ceilometer/ceilometer-central/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 diff --git a/docker/common/ceilometer/ceilometer-collector/config-internal.sh b/docker/common/ceilometer/ceilometer-collector/config-internal.sh deleted file mode 100755 index 1ed4c9e7d0..0000000000 --- a/docker/common/ceilometer/ceilometer-collector/config-internal.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -set -e - -. /opt/kolla/kolla-common.sh -. /opt/kolla/config-ceilometer.sh - - -exec /usr/bin/ceilometer-collector diff --git a/docker/common/ceilometer/ceilometer-collector/start.sh b/docker/common/ceilometer/ceilometer-collector/start.sh index dee31e404a..3a59c17d1c 100755 --- a/docker/common/ceilometer/ceilometer-collector/start.sh +++ b/docker/common/ceilometer/ceilometer-collector/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 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 633fa6183a..0000000000 --- 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 dff79dd1b1..19d90be2f9 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 diff --git a/docker/common/ceilometer/ceilometer-notification/config-internal.sh b/docker/common/ceilometer/ceilometer-notification/config-internal.sh deleted file mode 100755 index 9397345497..0000000000 --- a/docker/common/ceilometer/ceilometer-notification/config-internal.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -set -e - -. /opt/kolla/kolla-common.sh -. /opt/kolla/config-ceilometer.sh - - -exec /usr/bin/ceilometer-agent-notification diff --git a/docker/common/ceilometer/ceilometer-notification/start.sh b/docker/common/ceilometer/ceilometer-notification/start.sh index 1fc97ff214..8ce4b44883 100755 --- a/docker/common/ceilometer/ceilometer-notification/start.sh +++ b/docker/common/ceilometer/ceilometer-notification/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