openstack/kolla
Code Issues Proposed changes

Add boto3 python dependencies into gnocchi-base image

Browse Source 
Adding boto3 python library into gnocchi-base image

Change-Id: I22119f570172ca93de0587dc3892d8b8de86d525
Closes-bug: #1821580
This commit is contained in:
Cyril Grosjean 2019-03-26 20:10:57 +01:00
parent 3a2e4081fd
commit 0c732805b1
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') %} {% if distro_python_version.startswith('3') %}
{% set gnocchi_base_packages = gnocchi_base_packages + [ {% set gnocchi_base_packages = gnocchi_base_packages + [
'python3-boto3',
'python3-cradox', 'python3-cradox',
'python3-ldappool', 'python3-ldappool',
'python3-mod_wsgi' 'python3-mod_wsgi'
@ -24,8 +25,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% else %} {% else %}
{% set gnocchi_base_packages = gnocchi_base_packages + [ {% set gnocchi_base_packages = gnocchi_base_packages + [
'mod_wsgi', 'mod_wsgi',
'python2-ldappool', 'python-boto3',
'python2-cradox' 'python2-cradox',
'python2-ldappool'
] %} ] %}
{% endif %} {% endif %}
{{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }} {{ 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', 'gnocchi-common',
'libapache2-mod-wsgi-py3', 'libapache2-mod-wsgi-py3',
'librados-dev', 'librados-dev',
'python3-boto3',
'python3-dev', 'python3-dev',
'python3-ldappool', 'python3-ldappool',
'python3-pip',
'python3-rados', 'python3-rados',
'python3-setuptools', 'python3-setuptools'
'python3-pip'
] %} ] %}
{% set gnocchi_base_pip_packages = [ {% set gnocchi_base_pip_packages = [
'cradox' 'cradox'
@ -116,7 +119,7 @@ ADD gnocchi-base-archive /gnocchi-base-source
{% set gnocchi_base_pip_packages = [ {% set gnocchi_base_pip_packages = [
'gnocchiclient', 'gnocchiclient',
'/gnocchi[keystone,mysql,file,ceph]' '/gnocchi[keystone,mysql,file,ceph,s3]'
] %} ] %}
RUN ln -s gnocchi-base-source/* gnocchi \ RUN ln -s gnocchi-base-source/* gnocchi \