diff options
| author | Zuul <zuul@review.openstack.org> | 2019-03-27 15:34:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-03-27 15:34:19 +0000 |
| commit | 09f37541d8e57d85aa568a0ad6a23c44ef11a36e (patch) | |
| tree | 25c50934ad9c0b66451d032c3ba6e063e059e81c | |
| parent | 2dc9191c8ccf9c7f7de16525989cb17685c2b1f3 (diff) | |
| parent | 0c732805b1390e12521f50d666fc18319fe9e0f3 (diff) | |
| download | kolla-09f37541d8e57d85aa568a0ad6a23c44ef11a36e.tar.gz kolla-09f37541d8e57d85aa568a0ad6a23c44ef11a36e.zip | |
Merge "Add boto3 python dependencies into gnocchi-base image"
| -rw-r--r-- | docker/gnocchi/gnocchi-base/Dockerfile.j2 | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index 457698260..ee3c389e3 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2 @@ -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 \ |