openstack
/
kolla
Code Issues Proposed changes

Merge "Add nfs dependencies to glance container"

This commit is contained in:
Zuul 2020-04-04 13:54:16 +00:00 committed by Gerrit Code Review
parent a2659460f2 cac9d46aa6
commit 4905a1ca6c
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/glance/glance-api/Dockerfile.j2
View File

@ -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")) }}

6
releasenotes/notes/bug-1868574.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixes Glance inability to use Cinder NFS backend for images by including
NFS client components in the Glance API image.
`LP#1868574 <https://launchpad.net/bugs/1868574>`__