diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-10 12:44:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-10 12:44:00 +0000 |
| commit | 1dc32f3e99eb4fb944a467443f790521afc9aaf3 (patch) | |
| tree | e05ec0c883230257454be9936cd87ddc46a4d44b /docker/centos/binary | |
| parent | 9211c5e26d3eca4066f6be2a33e6f633fd7e3b16 (diff) | |
| parent | 4d18dae2eb06b8caa8437c4f0fe0bfd38858a294 (diff) | |
| download | kolla-1dc32f3e99eb4fb944a467443f790521afc9aaf3.tar.gz kolla-1dc32f3e99eb4fb944a467443f790521afc9aaf3.zip | |
Merge "Remove config-internal from ceilometer"
Diffstat (limited to 'docker/centos/binary')
7 files changed, 6 insertions, 8 deletions
diff --git a/docker/centos/binary/ceilometer/ceilometer-alarm/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-alarm/Dockerfile index efe2684ee..92ba970ac 100644 --- a/docker/centos/binary/ceilometer/ceilometer-alarm/Dockerfile +++ b/docker/centos/binary/ceilometer/ceilometer-alarm/Dockerfile @@ -4,6 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum install -y openstack-ceilometer-alarm && yum clean all 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/binary/ceilometer/ceilometer-api/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-api/Dockerfile index d80da07bb..56cb0fb87 100644 --- a/docker/centos/binary/ceilometer/ceilometer-api/Dockerfile +++ b/docker/centos/binary/ceilometer/ceilometer-api/Dockerfile @@ -4,5 +4,5 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum install -y openstack-ceilometer-api && yum clean all 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/binary/ceilometer/ceilometer-base/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-base/Dockerfile index 4ef1564de..30c8fbae3 100644 --- a/docker/centos/binary/ceilometer/ceilometer-base/Dockerfile +++ b/docker/centos/binary/ceilometer/ceilometer-base/Dockerfile @@ -1,4 +1,2 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY config-ceilometer.sh /opt/kolla/ diff --git a/docker/centos/binary/ceilometer/ceilometer-central/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-central/Dockerfile index 6317a43e4..f48a68d74 100644 --- a/docker/centos/binary/ceilometer/ceilometer-central/Dockerfile +++ b/docker/centos/binary/ceilometer/ceilometer-central/Dockerfile @@ -4,6 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum install -y openstack-ceilometer-central && yum clean all 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/binary/ceilometer/ceilometer-collector/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-collector/Dockerfile index 55cabe1e4..ed9b54011 100644 --- a/docker/centos/binary/ceilometer/ceilometer-collector/Dockerfile +++ b/docker/centos/binary/ceilometer/ceilometer-collector/Dockerfile @@ -4,6 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum install -y openstack-ceilometer-collector && yum clean all 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/binary/ceilometer/ceilometer-compute/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-compute/Dockerfile index 08bb70c1e..50a6b7bf6 100644 --- a/docker/centos/binary/ceilometer/ceilometer-compute/Dockerfile +++ b/docker/centos/binary/ceilometer/ceilometer-compute/Dockerfile @@ -5,6 +5,6 @@ RUN yum install -y openstack-ceilometer-compute python-ceilometerclient python-p && yum clean all 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/binary/ceilometer/ceilometer-notification/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-notification/Dockerfile index 2161b7f31..7314d7bd0 100644 --- a/docker/centos/binary/ceilometer/ceilometer-notification/Dockerfile +++ b/docker/centos/binary/ceilometer/ceilometer-notification/Dockerfile @@ -4,6 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum install -y openstack-ceilometer-notification && yum clean all COPY ./start.sh /start.sh -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] |