diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-04 13:54:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-04 13:54:17 +0000 |
| commit | 4905a1ca6cf54993c3c0c80c0e7a808752294a58 (patch) | |
| tree | f81b45e429cc3f0e620c99f65da3946d1ed835cd /docker | |
| parent | a2659460f2c501ce4ea24b805d21eb1257a2fdb8 (diff) | |
| parent | cac9d46aa6dbac6631bdcae67db125a88e1c3234 (diff) | |
| download | kolla-4905a1ca6cf54993c3c0c80c0e7a808752294a58.tar.gz kolla-4905a1ca6cf54993c3c0c80c0e7a808752294a58.zip | |
Merge "Add nfs dependencies to glance container"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/glance/glance-api/Dockerfile.j2 | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2 index cd61b5fd4..5f6635faa 100644 --- a/docker/glance/glance-api/Dockerfile.j2 +++ b/docker/glance/glance-api/Dockerfile.j2 @@ -9,12 +9,16 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% if distro_package_manager == 'dnf' or base_distro not in ['centos'] %} - {% set glance_api_packages = ['qemu-img'] %} + {% set glance_api_packages = ['qemu-img'] %} {% else %} - {% set glance_api_packages = ['qemu-img-ev'] %} + {% set glance_api_packages = ['qemu-img-ev'] %} {% endif %} + {% set glance_api_packages = glance_api_packages + ['nfs-utils'] %} {% elif base_package_type == 'deb' %} - {% set glance_api_packages = ['qemu-utils'] %} + {% set glance_api_packages = [ + 'nfs-common', + 'qemu-utils' + ] %} {% endif %} {{ macros.install_packages(glance_api_packages | customizable("packages")) }} |