openstack/kolla-ansible
Code Issues Proposed changes

Merge "Unify Centos and Ubuntu Source Install - Ceilometer"

Browse Source
This commit is contained in:
Jenkins 2015-08-27 16:45:08 +00:00 committed by Gerrit Code Review
commit 63db5ce3d8
8 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker_templates/ceilometer/ceilometer-alarm/build
View File

@ -1 +0,0 @@
../../../tools/build-docker-image

1
docker_templates/ceilometer/ceilometer-api/build
View File

@ -1 +0,0 @@
../../../tools/build-docker-image

13
docker_templates/ceilometer/ceilometer-base/Dockerfile.j2
View File

@ -10,15 +10,12 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% endif %}
{% elif install_type == 'source' %}
ADD ./ceilometer.tar /
RUN ln -s /ceilometer-* /ceilometer
RUN cd /ceilometer \
ADD ceilometer.tar /
RUN ln -s /ceilometer-* ceilometer \
&& useradd --user-group ceilometer \
&& pip install -r requirements.txt \
&& pip install /ceilometer \
&& mkdir /etc/ceilometer /var/log/ceilometer \
&& pip --no-cache-dir install /ceilometer \
&& mkdir -p /etc/ceilometer /var/log/ceilometer /home/ceilometer \
&& cp -r /ceilometer/etc/* /etc/ceilometer/ \
&& rm -rf /root/.cache
&& chown -R ceilometer: /etc/ceilometer /var/log/ceilometer /home/ceilometer
{% endif %}

1
docker_templates/ceilometer/ceilometer-base/build
View File

@ -1 +0,0 @@
../../../tools/build-docker-image

1
docker_templates/ceilometer/ceilometer-central/build
View File

@ -1 +0,0 @@
../../../tools/build-docker-image

1
docker_templates/ceilometer/ceilometer-collector/build
View File

@ -1 +0,0 @@
../../../tools/build-docker-image

1
docker_templates/ceilometer/ceilometer-compute/build
View File

@ -1 +0,0 @@
../../../tools/build-docker-image

1
docker_templates/ceilometer/ceilometer-notification/build
View File

@ -1 +0,0 @@
../../../tools/build-docker-image