diff options
| author | zhubingbing <zhu.bingbing@99cloud.net> | 2017-01-18 03:44:40 +0000 |
|---|---|---|
| committer | zhubingbing <zhu.bingbing@99cloud.net> | 2017-01-18 16:16:14 +0000 |
| commit | 1493f48753e2d820beccd32c4c3d820abb6bc282 (patch) | |
| tree | 869e5708dc46dd077adc255588371a96f003de7d /docker | |
| parent | be9a8789a698b45f9eb423c599fc603b80472bc9 (diff) | |
| download | kolla-1493f48753e2d820beccd32c4c3d820abb6bc282.tar.gz kolla-1493f48753e2d820beccd32c4c3d820abb6bc282.zip | |
Fix gnocchi dockerfile
* remove /var/log/gnocchi
* move gnocchiclient to openstack-base
* remove /var/lib/gnocchi because it create by macro
Change-Id: I4e06991dd7ca45b4c705b0e4be6e22ba1667e861
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/gnocchi/gnocchi-base/Dockerfile.j2 | 11 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 3 |
2 files changed, 7 insertions, 7 deletions
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 diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index bb9fcb77c..4a6c75807 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -93,6 +93,7 @@ MAINTAINER {{ maintainer }} 'python-fixtures', 'python-futures', 'python-glanceclient', + 'python-gnocchiclient', 'python-heatclient', 'python-httplib2', 'python-idna', @@ -167,6 +168,7 @@ ENV DEBIAN_FRONTEND noninteractive 'python-ceilometerclient', 'python-congressclient', 'python-designateclient', + 'python-gnocchiclient', 'python-heatclient', 'python-ironicclient', 'python-magnumclient', @@ -263,6 +265,7 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ 'functools32', 'futures', 'futurist', + 'gnocchiclient', 'greenlet', 'iso8601', 'jinja2', |