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
This commit is contained in:
parent
213452b4ba
commit
a6e528dfbb
|
@ -55,7 +55,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
'openvswitch-switch',
|
'openvswitch-switch',
|
||||||
'open-iscsi',
|
'open-iscsi',
|
||||||
'parted',
|
'parted',
|
||||||
'pmdk-tools',
|
|
||||||
'python3-cephfs',
|
'python3-cephfs',
|
||||||
'python3-guestfs',
|
'python3-guestfs',
|
||||||
'python3-ironicclient',
|
'python3-ironicclient',
|
||||||
|
@ -69,10 +68,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
] %}
|
] %}
|
||||||
# FIXME(pkopec): since Ubuntu 19.04 'ndctl' package is available
|
# FIXME(pkopec): since Ubuntu 19.04 'ndctl' package is available
|
||||||
# for other archs than 'x86_64
|
# for other archs than 'x86_64
|
||||||
|
# NOTE(hrw): similar situation with 'pmdk-tools'
|
||||||
{% if base_distro == 'debian' or
|
{% if base_distro == 'debian' or
|
||||||
(base_distro == 'ubuntu' and base_arch == 'x86_64') %}
|
(base_distro == 'ubuntu' and base_arch == 'x86_64') %}
|
||||||
{% set nova_compute_packages = nova_compute_packages + [
|
{% set nova_compute_packages = nova_compute_packages + [
|
||||||
'ndctl',
|
'ndctl',
|
||||||
|
'pmdk-tools',
|
||||||
] %}
|
] %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
@ -124,7 +125,6 @@ RUN rm -f /etc/nova/nova-compute.conf
|
||||||
'nfs-common',
|
'nfs-common',
|
||||||
'open-iscsi',
|
'open-iscsi',
|
||||||
'parted',
|
'parted',
|
||||||
'pmdk-tools',
|
|
||||||
'python3-cephfs',
|
'python3-cephfs',
|
||||||
'python3-guestfs',
|
'python3-guestfs',
|
||||||
'python3-libvirt',
|
'python3-libvirt',
|
||||||
|
@ -144,10 +144,12 @@ RUN rm -f /etc/nova/nova-compute.conf
|
||||||
{% endif %}
|
{% endif %}
|
||||||
# FIXME(pkopec): since Ubuntu 19.04 'ndctl' package is available
|
# FIXME(pkopec): since Ubuntu 19.04 'ndctl' package is available
|
||||||
# for other archs than 'x86_64'
|
# for other archs than 'x86_64'
|
||||||
|
# NOTE(hrw): similar situation with 'pmdk-tools'
|
||||||
{% if base_distro == 'debian' or
|
{% if base_distro == 'debian' or
|
||||||
(base_distro == 'ubuntu' and base_arch == 'x86_64') %}
|
(base_distro == 'ubuntu' and base_arch == 'x86_64') %}
|
||||||
{% set nova_compute_packages = nova_compute_packages + [
|
{% set nova_compute_packages = nova_compute_packages + [
|
||||||
'ndctl',
|
'ndctl',
|
||||||
|
'pmdk-tools',
|
||||||
] %}
|
] %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue