aboutsummaryrefslogtreecommitdiff
path: root/docker/nova/nova-compute
diff options
context:
space:
mode:
Diffstat (limited to 'docker/nova/nova-compute')
-rw-r--r--docker/nova/nova-compute/Dockerfile.j212
1 files changed, 9 insertions, 3 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index 3fa20eac0..730e56f68 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -39,7 +39,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %}
{% endif %}
-{{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
+{{ macros.install_packages(nova_compute_packages | customizable("packages")) }} \
+ && dnf remove -y linux-firmware \
+ && dnf clean all
{% elif base_package_type == 'deb' %}
@@ -112,6 +114,10 @@ RUN rm -f /etc/nova/nova-compute.conf
] %}
{% endif %}
+{{ macros.install_packages(nova_compute_packages | customizable("packages")) }} \
+ && dnf remove -y linux-firmware \
+ && dnf clean all
+
{% elif base_package_type == 'deb' %}
{% set nova_compute_packages = [
@@ -151,11 +157,11 @@ RUN rm -f /etc/nova/nova-compute.conf
] %}
{% endif %}
-RUN mkdir -p /etc/ceph
+RUN mkdir -p /etc/ceph \
+ && {{ macros.install_packages(nova_compute_packages | customizable("packages"), chain=True) }}
{% endif %}
-{{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
{% set nova_compute_pip_packages = [
'oslo-vmware'