diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-20 06:10:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-20 06:10:32 +0000 |
| commit | cae2305f78eb7046ad0bc4dd05626227bd74c9a9 (patch) | |
| tree | 1d20d6229e6a855481780de0ec45a11d8b9d71df | |
| parent | af0ba32a6a7ed580ab9a9d010b6e5ea8ae3bb77c (diff) | |
| parent | 1493f48753e2d820beccd32c4c3d820abb6bc282 (diff) | |
| download | kolla-cae2305f78eb7046ad0bc4dd05626227bd74c9a9.tar.gz kolla-cae2305f78eb7046ad0bc4dd05626227bd74c9a9.zip | |
Merge "Fix gnocchi dockerfile"
| -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 9dea12588..8e3977583 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -94,6 +94,7 @@ MAINTAINER {{ maintainer }} 'python-fixtures', 'python-futures', 'python-glanceclient', + 'python-gnocchiclient', 'python-heatclient', 'python-httplib2', 'python-idna', @@ -169,6 +170,7 @@ ENV DEBIAN_FRONTEND noninteractive 'python-ceilometerclient', 'python-congressclient', 'python-designateclient', + 'python-gnocchiclient', 'python-heatclient', 'python-ironicclient', 'python-magnumclient', @@ -266,6 +268,7 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ 'functools32', 'futures', 'futurist', + 'gnocchiclient', 'greenlet', 'iso8601', 'jinja2', |