Skip to content
Snippets Groups Projects
Commit 1dc32f3e authored by Jenkins's avatar Jenkins Committed by Gerrit Code Review
Browse files

Merge "Remove config-internal from ceilometer"

parents 9211c5e2 4d18dae2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 6 additions and 8 deletions
docker/centos/binary/ceilometer/ceilometer-alarm/Dockerfile
+ 1
− 1
View file @ 1dc32f3e
...@@ -4,6 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) ...@@ -4,6 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-alarm && yum clean all RUN yum install -y openstack-ceilometer-alarm && yum clean all
COPY ./start.sh /start.sh COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-external.sh /opt/kolla/
CMD ["/start.sh"] CMD ["/start.sh"]
docker/centos/binary/ceilometer/ceilometer-api/Dockerfile
+ 1
− 1
View file @ 1dc32f3e
...@@ -4,5 +4,5 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) ...@@ -4,5 +4,5 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-api && yum clean all RUN yum install -y openstack-ceilometer-api && yum clean all
COPY ./start.sh /start.sh COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-external.sh /opt/kolla/
CMD ["/start.sh"] CMD ["/start.sh"]
docker/centos/binary/ceilometer/ceilometer-base/Dockerfile
+ 0
− 2
View file @ 1dc32f3e
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
COPY config-ceilometer.sh /opt/kolla/
docker/centos/binary/ceilometer/ceilometer-central/Dockerfile
+ 1
− 1
View file @ 1dc32f3e
...@@ -4,6 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) ...@@ -4,6 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-central && yum clean all RUN yum install -y openstack-ceilometer-central && yum clean all
COPY ./start.sh /start.sh COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-external.sh /opt/kolla/
CMD ["/start.sh"] CMD ["/start.sh"]
docker/centos/binary/ceilometer/ceilometer-collector/Dockerfile
+ 1
− 1
View file @ 1dc32f3e
...@@ -4,6 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) ...@@ -4,6 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-collector && yum clean all RUN yum install -y openstack-ceilometer-collector && yum clean all
COPY ./start.sh /start.sh COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-external.sh /opt/kolla/
CMD ["/start.sh"] CMD ["/start.sh"]
docker/centos/binary/ceilometer/ceilometer-compute/Dockerfile
+ 1
− 1
View file @ 1dc32f3e
...@@ -5,6 +5,6 @@ RUN yum install -y openstack-ceilometer-compute python-ceilometerclient python-p ...@@ -5,6 +5,6 @@ RUN yum install -y openstack-ceilometer-compute python-ceilometerclient python-p
&& yum clean all && yum clean all
COPY ./start.sh /start.sh COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-external.sh /opt/kolla/
CMD ["/start.sh"] CMD ["/start.sh"]
docker/centos/binary/ceilometer/ceilometer-notification/Dockerfile
+ 1
− 1
View file @ 1dc32f3e
...@@ -4,6 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) ...@@ -4,6 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-notification && yum clean all RUN yum install -y openstack-ceilometer-notification && yum clean all
COPY ./start.sh /start.sh COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-external.sh /opt/kolla/
CMD ["/start.sh"] CMD ["/start.sh"]
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment