Skip to content

Commit a6e528d

Browse files
committed
nova-compute: 'pmdk-tools' is x86-64 only in Ubuntu 'bionic'
Victoria+ branches use Ubuntu 'focal' where this package is available for aarch64 as well. Change-Id: I2076ab4a634418df5863174588a72e6c2ce8f05e
1 parent 213452b commit a6e528d

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

docker/nova/nova-compute/Dockerfile.j2

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
5555
'openvswitch-switch',
5656
'open-iscsi',
5757
'parted',
58-
'pmdk-tools',
5958
'python3-cephfs',
6059
'python3-guestfs',
6160
'python3-ironicclient',
@@ -69,10 +68,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
6968
] %}
7069
# FIXME(pkopec): since Ubuntu 19.04 'ndctl' package is available
7170
# for other archs than 'x86_64
71+
# NOTE(hrw): similar situation with 'pmdk-tools'
7272
{% if base_distro == 'debian' or
7373
(base_distro == 'ubuntu' and base_arch == 'x86_64') %}
7474
{% set nova_compute_packages = nova_compute_packages + [
7575
'ndctl',
76+
'pmdk-tools',
7677
] %}
7778
{% endif %}
7879

@@ -124,7 +125,6 @@ RUN rm -f /etc/nova/nova-compute.conf
124125
'nfs-common',
125126
'open-iscsi',
126127
'parted',
127-
'pmdk-tools',
128128
'python3-cephfs',
129129
'python3-guestfs',
130130
'python3-libvirt',
@@ -144,10 +144,12 @@ RUN rm -f /etc/nova/nova-compute.conf
144144
{% endif %}
145145
# FIXME(pkopec): since Ubuntu 19.04 'ndctl' package is available
146146
# for other archs than 'x86_64'
147+
# NOTE(hrw): similar situation with 'pmdk-tools'
147148
{% if base_distro == 'debian' or
148149
(base_distro == 'ubuntu' and base_arch == 'x86_64') %}
149150
{% set nova_compute_packages = nova_compute_packages + [
150151
'ndctl',
152+
'pmdk-tools',
151153
] %}
152154
{% endif %}
153155

0 commit comments

Comments
 (0)