openstack
/
kolla
Code Issues Proposed changes

Merge "nova-compute: daxio on CentOS 8 is x86-64 only" into stable/victoria

This commit is contained in:
Zuul 2020-12-23 20:41:17 +00:00 committed by Gerrit Code Review
parent 87ce9c63d0 43bc9a3ada
commit fee9edb2a3
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set nova_compute_packages = [
'ceph-common',
'daxio',
'device-mapper-multipath',
'e2fsprogs',
'genisoimage',
@ -33,6 +32,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'xfsprogs'
] %}
# NOTE(hrw): daxio is part of pmdk which is x86-64 only in CentOS 8
{% if base_arch == 'x86_64' %}
{% set nova_compute_packages = nova_compute_packages + [
'daxio'
] %}
{% endif %}
{{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
{% elif base_package_type == 'deb' %}
@ -80,7 +86,6 @@ RUN rm -f /etc/nova/nova-compute.conf
{% set nova_compute_packages = [
'ceph-common',
'daxio',
'device-mapper-multipath',
'dosfstools',
'e2fsprogs',
@ -100,6 +105,13 @@ RUN rm -f /etc/nova/nova-compute.conf
'xfsprogs'
] %}
# NOTE(hrw): daxio is part of pmdk which is x86-64 only in CentOS 8
{% if base_arch == 'x86_64' %}
{% set nova_compute_packages = nova_compute_packages + [
'daxio'
] %}
{% endif %}
{% elif base_package_type == 'deb' %}
{% set nova_compute_packages = [