summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorMartin Schuppert <mschuppert@redhat.com>2019-10-30 09:43:23 +0100
committerMartin Schuppert <mschuppert@redhat.com>2019-10-30 10:32:47 +0100
commit23e488dfe73a9273698f2a33d8b74f770d9a83f6 (patch)
tree5f5353a52c324df4a38ffa3b191340d1549e18ca /docker
parent7115cde259817a325e1585b6e87ebd79c7cd8f7f (diff)
downloadkolla-23e488dfe73a9273698f2a33d8b74f770d9a83f6.tar.gz
kolla-23e488dfe73a9273698f2a33d8b74f770d9a83f6.zip
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 Change-Id: Iaf3414464f3dd747427247339c6b201b352063cb (cherry picked from commit 9b1a243a3a1669532f25bbdcbc56b78f0f72882c)
Diffstat (limited to 'docker')
-rw-r--r--docker/nova/nova-compute/Dockerfile.j212
1 files changed, 8 insertions, 4 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index 8e76278c1..e4e217697 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -20,7 +20,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openvswitch',
'parted',
'sysfsutils',
- 'targetcli'
+ 'targetcli',
+ 'xfsprogs'
] %}
{% if distro_python_version.startswith('3') %}
@@ -61,7 +62,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python3-rbd',
'python3-rtslib-fb',
'sysfsutils',
- 'targetcli-fb'
+ 'targetcli-fb',
+ 'xfsprogs'
] %}
{{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
@@ -88,7 +90,8 @@ RUN rm -f /etc/nova/nova-compute.conf
'python-rtslib',
'qemu-img-ev',
'sysfsutils',
- 'targetcli'
+ 'targetcli',
+ 'xfsprogs'
] %}
{% elif base_package_type == 'deb' %}
@@ -107,7 +110,8 @@ RUN rm -f /etc/nova/nova-compute.conf
'python-libvirt',
'python-rtslib-fb',
'qemu-utils',
- 'targetcli-fb'
+ 'targetcli-fb',
+ 'xfsprogs'
] %}
{% if base_arch == "aarch64" %}