openstack/kolla
Code Issues Proposed changes

Merge "Fix gnocchi dockerfile"

Browse Source
This commit is contained in:
Jenkins 2017-01-20 06:10:32 +00:00 committed by Gerrit Code Review
commit cae2305f78
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docker/gnocchi/gnocchi-base/Dockerfile.j2
View File

@ -12,7 +12,6 @@ MAINTAINER {{ maintainer }}
{% set gnocchi_base_packages = [ {% set gnocchi_base_packages = [
'openstack-gnocchi-common', 'openstack-gnocchi-common',
'python-gnocchiclient',
'httpd', 'httpd',
'mod_wsgi', 'mod_wsgi',
'python-ldappool', 'python-ldappool',
@ -63,18 +62,16 @@ RUN truncate -s 0 /etc/apache2/ports.conf
ADD gnocchi-base-archive /gnocchi-base-source ADD gnocchi-base-archive /gnocchi-base-source
RUN ln -s gnocchi-base-source/* gnocchi \ 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] \ && /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 /var/log/kolla/gnocchi \ && mkdir -p /etc/gnocchi \
&& chown -R gnocchi: /etc/gnocchi /var/log/kolla/gnocchi && chown -R gnocchi: /etc/gnocchi
{% endif %} {% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY extend_start.sh /usr/local/bin/kolla_extend_start
COPY gnocchi_sudoers /etc/sudoers.d/kolla_gnocchi_sudoers COPY gnocchi_sudoers /etc/sudoers.d/kolla_gnocchi_sudoers
RUN mkdir -p /var/lib/gnocchi \ RUN chmod 750 /etc/sudoers.d \
&& chown -R gnocchi: /var/lib/gnocchi \
&& chmod 750 /etc/sudoers.d \
&& chmod 640 /etc/sudoers.d/kolla_gnocchi_sudoers \ && chmod 640 /etc/sudoers.d/kolla_gnocchi_sudoers \
&& touch /usr/local/bin/kolla_gnocchi_extend_start \ && touch /usr/local/bin/kolla_gnocchi_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_gnocchi_extend_start && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_gnocchi_extend_start

3
docker/openstack-base/Dockerfile.j2
View File

@ -94,6 +94,7 @@ MAINTAINER {{ maintainer }}
'python-fixtures', 'python-fixtures',
'python-futures', 'python-futures',
'python-glanceclient', 'python-glanceclient',
'python-gnocchiclient',
'python-heatclient', 'python-heatclient',
'python-httplib2', 'python-httplib2',
'python-idna', 'python-idna',
@ -169,6 +170,7 @@ ENV DEBIAN_FRONTEND noninteractive
'python-ceilometerclient', 'python-ceilometerclient',
'python-congressclient', 'python-congressclient',
'python-designateclient', 'python-designateclient',
'python-gnocchiclient',
'python-heatclient', 'python-heatclient',
'python-ironicclient', 'python-ironicclient',
'python-magnumclient', 'python-magnumclient',
@ -266,6 +268,7 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
'functools32', 'functools32',
'futures', 'futures',
'futurist', 'futurist',
'gnocchiclient',
'greenlet', 'greenlet',
'iso8601', 'iso8601',
'jinja2', 'jinja2',