openstack/kolla
Code Issues Proposed changes

Merge "Add boto3 python dependencies into gnocchi-base image"

Browse Source
This commit is contained in:
Zuul 2019-03-27 15:34:19 +00:00 committed by Gerrit Code Review
commit 09f37541d8
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %}
{% if distro_python_version.startswith('3') %}
{% set gnocchi_base_packages = gnocchi_base_packages + [
'python3-boto3',
'python3-cradox',
'python3-ldappool',
'python3-mod_wsgi'
@ -24,8 +25,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% else %}
{% set gnocchi_base_packages = gnocchi_base_packages + [
'mod_wsgi',
'python2-ldappool',
'python2-cradox'
'python-boto3',
'python2-cradox',
'python2-ldappool'
] %}
{% endif %}
{{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
@ -39,11 +41,12 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
'gnocchi-common',
'libapache2-mod-wsgi-py3',
'librados-dev',
'python3-boto3',
'python3-dev',
'python3-ldappool',
'python3-pip',
'python3-rados',
'python3-setuptools',
'python3-pip'
'python3-setuptools'
] %}
{% set gnocchi_base_pip_packages = [
'cradox'
@ -116,7 +119,7 @@ ADD gnocchi-base-archive /gnocchi-base-source
{% set gnocchi_base_pip_packages = [
'gnocchiclient',
'/gnocchi[keystone,mysql,file,ceph]'
'/gnocchi[keystone,mysql,file,ceph,s3]'
] %}
RUN ln -s gnocchi-base-source/* gnocchi \