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 < /openrc <