diff options
| author | Zuul <zuul@review.opendev.org> | 2021-01-26 20:35:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-01-26 20:35:49 +0000 |
| commit | fc0ebe07c2e88ee000caf43d7ba67ceed7d7a842 (patch) | |
| tree | dc32673bec39565357952a5e8091b5d93ecb4743 | |
| parent | 2b7f1952e3db24f1fbf0e2270163c76676c3baa8 (diff) | |
| parent | 190f81bc84be3ba8d398fc8db661a3539aa060a0 (diff) | |
| download | kolla-fc0ebe07c2e88ee000caf43d7ba67ceed7d7a842.tar.gz kolla-fc0ebe07c2e88ee000caf43d7ba67ceed7d7a842.zip | |
Merge "nova-compute: 'pmdk-tools' is x86-64 only in Ubuntu 'bionic'" into stable/train9.3.1
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index efdb75aad..77e4d732a 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -62,7 +62,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openvswitch-switch', 'open-iscsi', 'parted', - 'pmdk-tools', 'python3-cephfs', 'python3-guestfs', 'python3-ironicclient', @@ -76,10 +75,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} # FIXME(pkopec): since Ubuntu 19.04 'ndctl' package is available # for other archs than 'x86_64 + # NOTE(hrw): similar situation with 'pmdk-tools' {% if base_distro == 'debian' or (base_distro == 'ubuntu' and base_arch == 'x86_64') %} {% set nova_compute_packages = nova_compute_packages + [ 'ndctl', + 'pmdk-tools', ] %} {% endif %} @@ -149,7 +150,6 @@ RUN rm -f /etc/nova/nova-compute.conf 'nfs-common', 'open-iscsi', 'parted', - 'pmdk-tools', 'python3-cephfs', 'python3-guestfs', 'python3-libvirt', @@ -169,10 +169,12 @@ RUN rm -f /etc/nova/nova-compute.conf {% endif %} # FIXME(pkopec): since Ubuntu 19.04 'ndctl' package is available # for other archs than 'x86_64' + # NOTE(hrw): similar situation with 'pmdk-tools' {% if base_distro == 'debian' or (base_distro == 'ubuntu' and base_arch == 'x86_64') %} {% set nova_compute_packages = nova_compute_packages + [ 'ndctl', + 'pmdk-tools', ] %} {% endif %} |