From 1493f48753e2d820beccd32c4c3d820abb6bc282 Mon Sep 17 00:00:00 2001 From: zhubingbing Date: Wed, 18 Jan 2017 03:44:40 +0000 Subject: Fix gnocchi dockerfile * remove /var/log/gnocchi * move gnocchiclient to openstack-base * remove /var/lib/gnocchi because it create by macro Change-Id: I4e06991dd7ca45b4c705b0e4be6e22ba1667e861 --- docker/gnocchi/gnocchi-base/Dockerfile.j2 | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'docker/gnocchi') diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index e68cac2e1..dfc7cbb1e 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2 @@ -12,7 +12,6 @@ MAINTAINER {{ maintainer }} {% set gnocchi_base_packages = [ 'openstack-gnocchi-common', - 'python-gnocchiclient', 'httpd', 'mod_wsgi', 'python-ldappool', @@ -63,18 +62,16 @@ RUN truncate -s 0 /etc/apache2/ports.conf ADD gnocchi-base-archive /gnocchi-base-source RUN ln -s gnocchi-base-source/* gnocchi \ - && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt gnocchiclient /gnocchi[keystone,mysql,file,ceph] \ - && mkdir -p /etc/gnocchi /var/log/kolla/gnocchi \ - && chown -R gnocchi: /etc/gnocchi /var/log/kolla/gnocchi + && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /gnocchi[keystone,mysql,file,ceph] \ + && mkdir -p /etc/gnocchi \ + && chown -R gnocchi: /etc/gnocchi {% endif %} COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY gnocchi_sudoers /etc/sudoers.d/kolla_gnocchi_sudoers -RUN mkdir -p /var/lib/gnocchi \ - && chown -R gnocchi: /var/lib/gnocchi \ - && chmod 750 /etc/sudoers.d \ +RUN chmod 750 /etc/sudoers.d \ && chmod 640 /etc/sudoers.d/kolla_gnocchi_sudoers \ && touch /usr/local/bin/kolla_gnocchi_extend_start \ && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_gnocchi_extend_start -- cgit v1.2.3