diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-09 17:18:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-09 17:18:22 +0000 |
| commit | 35142a0b75d26b8929a9d7e4ea83fb870534025b (patch) | |
| tree | 860b6ff16668b711cd00941f0a620921e212cdb6 /docker/centos/source | |
| parent | 1340321eb5bcf6817fd13d44bdbf7ec39f9e956b (diff) | |
| parent | b84abb9425afebddf0109ecb36e383c2a228b5a8 (diff) | |
| download | kolla-35142a0b75d26b8929a9d7e4ea83fb870534025b.tar.gz kolla-35142a0b75d26b8929a9d7e4ea83fb870534025b.zip | |
Merge "Remove config-internal from ceilometer"
Diffstat (limited to 'docker/centos/source')
14 files changed, 6 insertions, 15 deletions
diff --git a/docker/centos/source/ceilometer/ceilometer-alarm/Dockerfile b/docker/centos/source/ceilometer/ceilometer-alarm/Dockerfile index fd640691a..86cf40d92 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 0f009e4be..000000000 --- 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 91baaf939..5db74a001 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 589c797ec..000000000 --- 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 98d53fc88..0b4e0e63d 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 63215435d..000000000 --- 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 fd640691a..86cf40d92 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 86fd40c4a..000000000 --- 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 fd640691a..86cf40d92 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 de90be372..000000000 --- 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 fd640691a..86cf40d92 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 ceefe1a9e..000000000 --- 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 fd640691a..86cf40d92 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 75a4ba990..000000000 --- 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 |