openstack
/
kolla
Code Issues Proposed changes

Add xfsprogs to nova-compute 

xfsprogs is required for formatting XFS ephemeral disk partitions
when format=xfs is specified as instance create failes with
'mkfs.xfs: No such file or directory' due to missing xfsprogs
package in the nova-compute container.

Closes-Bug: #1850610

Conflicts:
      docker/nova/nova-compute/Dockerfile.j2

Change-Id: Iaf3414464f3dd747427247339c6b201b352063cb
(cherry picked from commit 9b1a243a3a)
(cherry picked from commit 23e488dfe7)
(cherry picked from commit f0705fcfbd)
This commit is contained in:
Martin Schuppert 2019-10-30 09:43:23 +01:00
parent 26ec009bfd
commit b103210a86
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/nova/nova-compute/Dockerfile.j2
View File

@ -22,7 +22,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python-oslo-vmware', 'python-oslo-vmware',
'python-rtslib', 'python-rtslib',
'sysfsutils', 'sysfsutils',
'targetcli' 'targetcli',
'xfsprogs'
] %} ] %}
{{ macros.install_packages(nova_compute_packages | customizable("packages")) }} {{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
@ -44,7 +45,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python-guestfs', 'python-guestfs',
'python-ironicclient', 'python-ironicclient',
'python-oslo.vmware', 'python-oslo.vmware',
'sysfsutils' 'sysfsutils',
'xfsprogs'
] %} ] %}
# Debian/stretch uses rtslib-fb (like CentOS does) # Debian/stretch uses rtslib-fb (like CentOS does)
@ -86,7 +88,8 @@ RUN rm -f /etc/nova/nova-compute.conf
'python-rtslib', 'python-rtslib',
'qemu-img', 'qemu-img',
'sysfsutils', 'sysfsutils',
'targetcli' 'targetcli',
'xfsprogs'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_distro in ['debian', 'ubuntu'] %}
@ -103,7 +106,8 @@ RUN rm -f /etc/nova/nova-compute.conf
'parted', 'parted',
'python-guestfs', 'python-guestfs',
'python-libvirt', 'python-libvirt',
'qemu-utils' 'qemu-utils',
'xfsprogs'
] %} ] %}
{% if base_arch == "aarch64" %} {% if base_arch == "aarch64" %}