openstack/kolla-ansible
Code Issues Proposed changes

Merge "Remove config-internal from ceilometer"

Browse Source
This commit is contained in:
Jenkins 2015-08-10 12:44:00 +00:00 committed by Gerrit Code Review
commit 1dc32f3e99
7 changed files with 6 additions and 8 deletions
docker/centos/binary/ceilometer
ceilometer-alarm
Dockerfile
ceilometer-api
Dockerfile
ceilometer-base
Dockerfile
ceilometer-central
Dockerfile
ceilometer-collector
Dockerfile
ceilometer-compute
Dockerfile
ceilometer-notification
Dockerfile

2
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"]

2
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"]

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

2
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"]

2
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"]

2
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"]

2
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"]