aboutsummaryrefslogtreecommitdiff
path: root/docker/nova
diff options
context:
space:
mode:
Diffstat (limited to 'docker/nova')
-rw-r--r--docker/nova/nova-api/Dockerfile.j225
-rw-r--r--docker/nova/nova-base/Dockerfile.j2105
-rw-r--r--docker/nova/nova-compute-ironic/Dockerfile.j223
-rw-r--r--docker/nova/nova-compute/Dockerfile.j2210
-rw-r--r--docker/nova/nova-conductor/Dockerfile.j219
-rw-r--r--docker/nova/nova-novncproxy/Dockerfile.j226
-rw-r--r--docker/nova/nova-scheduler/Dockerfile.j219
-rw-r--r--docker/nova/nova-serialproxy/Dockerfile.j215
-rw-r--r--docker/nova/nova-spicehtml5proxy/Dockerfile.j240
9 files changed, 110 insertions, 372 deletions
diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2
index 28b645ab3..992a69325 100644
--- a/docker/nova/nova-api/Dockerfile.j2
+++ b/docker/nova/nova-api/Dockerfile.j2
@@ -7,30 +7,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
-{% if install_type == 'binary' %}
- {% if base_package_type == 'rpm' %}
-
- {% set nova_api_packages = [
- 'openstack-nova-api'
- ] %}
-
-{{ macros.install_packages(nova_api_packages | customizable("packages")) }}
-
- {% elif base_package_type == 'deb' %}
-
- {% set nova_api_packages = [
- 'nova-api',
- 'python3-memcache'
- ] %}
-
-{{ macros.install_packages(nova_api_packages | customizable("packages")) }}
- {% endif %}
-{% elif install_type == 'source' %}
-
- {% set nova_api_packages = [
- ] %}
+{% set nova_api_packages = [
+] %}
{{ macros.install_packages(nova_api_packages | customizable("packages")) }}
-{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_nova_extend_start
RUN chmod 755 /usr/local/bin/kolla_nova_extend_start
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2
index ca1fe10b9..712d6ada9 100644
--- a/docker/nova/nova-base/Dockerfile.j2
+++ b/docker/nova/nova-base/Dockerfile.j2
@@ -10,86 +10,46 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.enable_extra_repos(['libvirt', 'openvswitch']) }}
{{ macros.configure_user(name='nova', groups='qemu') }}
-{% if install_type == 'binary' %}
- {% if base_package_type == 'rpm' %}
+{% if base_package_type == 'rpm' %}
- {% set nova_base_packages = [
- 'openstack-nova-common',
- 'openvswitch'
+ {% set nova_base_packages = [
+ 'openvswitch',
+ 'python3-openvswitch'
+ ] %}
+ {% if base_arch == 'x86_64' %}
+ {% set nova_base_packages = nova_base_packages + [
+ 'edk2-ovmf'
] %}
-
- {% if base_arch == 'x86_64' %}
- {% set nova_base_packages = nova_base_packages + [
- 'edk2-ovmf'
- ] %}
- {% elif base_arch == 'aarch64' %}
- {% set nova_base_packages = nova_base_packages + [
- 'edk2-aarch64'
- ] %}
- {% endif %}
-
- {% elif base_package_type == 'deb' %}
-
- {% set nova_base_packages = [
- 'nova-common',
- 'openvswitch-switch',
- 'python3-nova'
+ {% elif base_arch == 'aarch64' %}
+ {% set nova_base_packages = nova_base_packages + [
+ 'edk2-aarch64'
] %}
-
- {% if base_arch == 'x86_64' %}
- {% set nova_base_packages = nova_base_packages + [
- 'ovmf'
- ] %}
- {% elif base_arch == 'aarch64' %}
- {% set nova_base_packages = nova_base_packages + [
- 'qemu-efi',
- ] %}
- {% endif %}
{% endif %}
-{{ macros.install_packages(nova_base_packages | customizable("packages")) }}
-
-{% elif install_type == 'source' %}
- {% if base_package_type == 'rpm' %}
-
- {% set nova_base_packages = [
- 'openvswitch',
- 'python3-openvswitch'
+{% elif base_package_type == 'deb' %}
+
+ {% set nova_base_packages = [
+ 'dnsmasq',
+ 'ebtables',
+ 'iproute2',
+ 'iptables',
+ 'openssh-client',
+ 'openvswitch-switch',
+ 'python3-libvirt',
+ 'python3-openvswitch'
+ ] %}
+ {% if base_arch == 'x86_64' %}
+ {% set nova_base_packages = nova_base_packages + [
+ 'ovmf'
] %}
- {% if base_arch == 'x86_64' %}
- {% set nova_base_packages = nova_base_packages + [
- 'edk2-ovmf'
- ] %}
- {% elif base_arch == 'aarch64' %}
- {% set nova_base_packages = nova_base_packages + [
- 'edk2-aarch64'
- ] %}
- {% endif %}
-
- {% elif base_package_type == 'deb' %}
-
- {% set nova_base_packages = [
- 'dnsmasq',
- 'ebtables',
- 'iproute2',
- 'iptables',
- 'openssh-client',
- 'openvswitch-switch',
- 'python3-libvirt',
- 'python3-openvswitch'
+ {% elif base_arch == 'aarch64' %}
+ {% set nova_base_packages = nova_base_packages + [
+ 'qemu-efi',
] %}
- {% if base_arch == 'x86_64' %}
- {% set nova_base_packages = nova_base_packages + [
- 'ovmf'
- ] %}
- {% elif base_arch == 'aarch64' %}
- {% set nova_base_packages = nova_base_packages + [
- 'qemu-efi',
- ] %}
- {% endif %}
-
{% endif %}
+{% endif %}
+
{{ macros.install_packages(nova_base_packages | customizable("packages")) }}
ADD nova-base-archive /nova-base-source
@@ -117,9 +77,6 @@ COPY nova_sudoers /etc/sudoers.d/kolla_nova_sudoers
RUN chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/kolla_nova_sudoers
-{% endif %}
-
-
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_nova_extend_start \
diff --git a/docker/nova/nova-compute-ironic/Dockerfile.j2 b/docker/nova/nova-compute-ironic/Dockerfile.j2
index 1c5d7be37..e5d42e4e6 100644
--- a/docker/nova/nova-compute-ironic/Dockerfile.j2
+++ b/docker/nova/nova-compute-ironic/Dockerfile.j2
@@ -9,31 +9,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set nova_compute_ironic_packages = ['genisoimage', 'nvme-cli'] %}
-{% if install_type == 'binary' %}
- {% if base_package_type == 'rpm' %}
-
- {% set nova_compute_ironic_packages = nova_compute_ironic_packages + [
- 'openstack-nova-compute'
- ] %}
-{{ macros.install_packages(nova_compute_ironic_packages | customizable("packages")) }}
-
- {% elif base_package_type == 'deb' %}
-
- {% set nova_compute_ironic_packages = nova_compute_ironic_packages + [
- 'nova-compute'
- ] %}
-{{ macros.install_packages(nova_compute_ironic_packages | customizable("packages")) }}
-
-RUN rm /etc/nova/nova-compute.conf
-
- {% endif %}
-
-{% elif install_type == 'source' %}
-
{{ macros.install_packages(nova_compute_ironic_packages | customizable("packages")) }}
-{% endif %}
-
{% block nova_compute_ironic_footer %}{% endblock %}
{% block footer %}{% endblock %}
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index 9996afd0f..13edac23e 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -9,162 +9,82 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.enable_extra_repos(['ceph', 'libvirt']) }}
-{% if install_type == 'binary' %}
- {% if base_package_type == 'rpm' %}
-
- {% set nova_compute_packages = [
- 'ceph-common',
- 'cyrus-sasl-md5',
- 'cyrus-sasl-scram',
- 'device-mapper-multipath',
- 'e2fsprogs',
- 'genisoimage',
- 'iscsi-initiator-utils',
- 'ndctl',
- 'nfs-utils',
- 'openstack-nova-compute',
- 'openvswitch',
- 'parted',
- 'python3-libguestfs',
- 'python3-oslo-vmware',
- 'python3-rtslib',
- 'sysfsutils',
- 'targetcli',
- 'xfsprogs'
+{% if base_package_type == 'rpm' %}
+
+ {% set nova_compute_packages = [
+ 'ceph-common',
+ 'cyrus-sasl-md5',
+ 'cyrus-sasl-scram',
+ 'device-mapper-multipath',
+ 'dosfstools',
+ 'e2fsprogs',
+ 'genisoimage',
+ 'iscsi-initiator-utils',
+ 'libosinfo',
+ 'ndctl',
+ 'nfs-utils',
+ 'nvme-cli',
+ 'openvswitch',
+ 'parted',
+ 'python3-libguestfs',
+ 'python3-libvirt',
+ 'python3-rtslib',
+ 'qemu-img',
+ 'sysfsutils',
+ 'targetcli',
+ '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'
] %}
-
- # 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")) }} \
- && dnf remove -y linux-firmware \
- && dnf clean all
-
- {% elif base_package_type == 'deb' %}
-
- # ironic as workaround https://bugs.launchpad.net/packstack/+bug/1430388
- {% set nova_compute_packages = [
- 'ceph-common',
- 'e2fsprogs',
- 'genisoimage',
- 'ironic-common',
- 'libsasl2-modules-gssapi-mit',
- 'multipath-tools',
- 'nfs-common',
- 'nova-compute',
- 'nvme-cli',
- 'open-iscsi',
- 'openvswitch-switch',
- 'parted',
- 'pmdk-tools',
- 'python3-cephfs',
- 'python3-guestfs',
- 'python3-ironicclient',
- 'python3-oslo.vmware',
- 'python3-rados',
- 'python3-rbd',
- 'python3-rtslib-fb',
- 'sasl2-bin',
- 'sysfsutils',
- 'targetcli-fb',
- 'xfsprogs'
- ] %}
- # FIXME(pkopec): since Ubuntu 19.04 'ndctl' package is available
- # for other archs than 'x86_64
- {% if base_distro == 'debian' or
- (base_distro == 'ubuntu' and base_arch == 'x86_64') %}
- {% set nova_compute_packages = nova_compute_packages + [
- 'ndctl',
- ] %}
- {% endif %}
-
-{{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
-
-RUN rm -f /etc/nova/nova-compute.conf
-
{% endif %}
-{% elif install_type == 'source' %}
- {% if base_package_type == 'rpm' %}
-
- {% set nova_compute_packages = [
- 'ceph-common',
- 'cyrus-sasl-md5',
- 'cyrus-sasl-scram',
- 'device-mapper-multipath',
- 'dosfstools',
- 'e2fsprogs',
- 'genisoimage',
- 'iscsi-initiator-utils',
- 'libosinfo',
- 'ndctl',
- 'nfs-utils',
- 'nvme-cli',
- 'openvswitch',
- 'parted',
- 'python3-libguestfs',
- 'python3-libvirt',
- 'python3-rtslib',
- 'qemu-img',
- 'sysfsutils',
- 'targetcli',
- '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")) }} \
&& dnf remove -y linux-firmware \
&& dnf clean all
- {% elif base_package_type == 'deb' %}
-
- {% set nova_compute_packages = [
- 'ceph-common',
- 'dosfstools',
- 'e2fsprogs',
- 'genisoimage',
- 'libosinfo-bin',
- 'libsasl2-modules-gssapi-mit',
- 'multipath-tools',
- 'ndctl',
- 'nfs-common',
- 'nvme-cli',
- 'open-iscsi',
- 'parted',
- 'pmdk-tools',
- 'python3-cephfs',
- 'python3-guestfs',
- 'python3-libvirt',
- 'python3-rados',
- 'python3-rbd',
- 'python3-rtslib-fb',
- 'qemu-utils',
- 'sasl2-bin',
- 'sysfsutils',
- 'targetcli-fb',
- 'xfsprogs'
+{% elif base_package_type == 'deb' %}
+
+ {% set nova_compute_packages = [
+ 'ceph-common',
+ 'dosfstools',
+ 'e2fsprogs',
+ 'genisoimage',
+ 'libosinfo-bin',
+ 'libsasl2-modules-gssapi-mit',
+ 'multipath-tools',
+ 'ndctl',
+ 'nfs-common',
+ 'nvme-cli',
+ 'open-iscsi',
+ 'parted',
+ 'pmdk-tools',
+ 'python3-cephfs',
+ 'python3-guestfs',
+ 'python3-libvirt',
+ 'python3-rados',
+ 'python3-rbd',
+ 'python3-rtslib-fb',
+ 'qemu-utils',
+ 'sasl2-bin',
+ 'sysfsutils',
+ 'targetcli-fb',
+ 'xfsprogs'
+ ] %}
+
+ {% if base_arch == "aarch64" %}
+ {% set nova_compute_packages = nova_compute_packages + [
+ 'qemu-efi'
] %}
-
- {% if base_arch == "aarch64" %}
- {% set nova_compute_packages = nova_compute_packages + [
- 'qemu-efi'
- ] %}
- {% endif %}
+ {% endif %}
RUN mkdir -p /etc/ceph \
&& {{ macros.install_packages(nova_compute_packages | customizable("packages"), chain=True) }}
- {% endif %}
-
+{% endif %}
{% set nova_compute_pip_packages = [
'oslo-vmware'
@@ -181,8 +101,6 @@ RUN {{ macros.install_pip(nova_compute_pip_packages | customizable("pip_packages
{{ macros.install_pip(nova_compute_plugins_pip_packages) }}; \
fi
-{% endif %}
-
COPY extend_start.sh /usr/local/bin/kolla_nova_extend_start
RUN chmod 755 /usr/local/bin/kolla_nova_extend_start \
&& rm -f /etc/machine-id
diff --git a/docker/nova/nova-conductor/Dockerfile.j2 b/docker/nova/nova-conductor/Dockerfile.j2
index 092f809d0..e497d2d7f 100644
--- a/docker/nova/nova-conductor/Dockerfile.j2
+++ b/docker/nova/nova-conductor/Dockerfile.j2
@@ -7,25 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
-{% if install_type == 'binary' %}
- {% if base_package_type == 'rpm' %}
-
- {% set nova_conductor_packages = [
- 'openstack-nova-conductor'
- ] %}
-
- {% elif base_package_type == 'deb' %}
-
- {% set nova_conductor_packages = [
- 'nova-conductor'
- ] %}
-
- {% endif %}
-
-{{ macros.install_packages(nova_conductor_packages | customizable("packages")) }}
-
-{% endif %}
-
COPY extend_start.sh /usr/local/bin/kolla_nova_extend_start
RUN chmod 755 /usr/local/bin/kolla_nova_extend_start
diff --git a/docker/nova/nova-novncproxy/Dockerfile.j2 b/docker/nova/nova-novncproxy/Dockerfile.j2
index 71e7ac37f..3fc35e71f 100644
--- a/docker/nova/nova-novncproxy/Dockerfile.j2
+++ b/docker/nova/nova-novncproxy/Dockerfile.j2
@@ -7,29 +7,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
-{% if install_type == 'binary' %}
- {% if base_package_type == 'rpm' %}
-
- {% set nova_novncproxy_packages = [
- 'novnc',
- 'openstack-nova-novncproxy'
- ] %}
-
- {% elif base_package_type == 'deb' %}
-
- {% set nova_novncproxy_packages = [
- 'nova-novncproxy'
- ] %}
-
- {% endif %}
-
-{% elif install_type == 'source' %}
-
- {% set nova_novncproxy_packages = [
- 'novnc'
- ] %}
-
-{% endif %}
+{% set nova_novncproxy_packages = [
+ 'novnc'
+] %}
{{ macros.install_packages(nova_novncproxy_packages | customizable("packages")) }}
diff --git a/docker/nova/nova-scheduler/Dockerfile.j2 b/docker/nova/nova-scheduler/Dockerfile.j2
index 303b3a728..765dc3840 100644
--- a/docker/nova/nova-scheduler/Dockerfile.j2
+++ b/docker/nova/nova-scheduler/Dockerfile.j2
@@ -7,25 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
-{% if install_type == 'binary' %}
- {% if base_package_type == 'rpm' %}
-
- {% set nova_scheduler_packages = [
- 'openstack-nova-scheduler'
- ] %}
-
- {% elif base_package_type == 'deb' %}
-
- {% set nova_scheduler_packages = [
- 'nova-scheduler'
- ] %}
-
- {% endif %}
-
-{{ macros.install_packages(nova_scheduler_packages | customizable("packages")) }}
-
-{% endif %}
-
{% block nova_scheduler_footer %}{% endblock %}
{% block footer %}{% endblock %}
diff --git a/docker/nova/nova-serialproxy/Dockerfile.j2 b/docker/nova/nova-serialproxy/Dockerfile.j2
index a22514b17..2c20ffdb8 100644
--- a/docker/nova/nova-serialproxy/Dockerfile.j2
+++ b/docker/nova/nova-serialproxy/Dockerfile.j2
@@ -7,21 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
-{% if install_type == 'binary' %}
- {% if base_package_type == 'rpm' %}
- {% set nova_serialproxy_packages = [
- 'openstack-nova-serialproxy'
- ] %}
- {% elif base_package_type == 'deb' %}
- {% set nova_serialproxy_packages = [
- 'nova-serialproxy'
- ] %}
- {% endif %}
-
-{{ macros.install_packages(nova_serialproxy_packages | customizable("packages")) }}
-
-{% endif %}
-
{% block nova_serialproxy_footer %}{% endblock %}
{% block footer %}{% endblock %}
diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
index 1351c48e5..e37af27df 100644
--- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
+++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
@@ -7,40 +7,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
-{% if install_type == 'binary' %}
- {% if base_package_type == 'rpm' %}
+{% if base_package_type == 'rpm' %}
- {% set nova_spicehtml5proxy_packages = [
- 'openstack-nova-spicehtml5proxy',
- 'python3-numpy',
- 'spice-html5'
- ] %}
+ {% set nova_spicehtml5proxy_packages = [
+ 'python3-numpy',
+ 'spice-html5'
+ ] %}
- {% elif base_package_type == 'deb' %}
+{% elif base_package_type == 'deb' %}
- {% set nova_spicehtml5proxy_packages = [
- 'nova-spiceproxy',
- 'websockify'
- ] %}
+ {% set nova_spicehtml5proxy_packages = [
+ 'spice-html5',
+ 'websockify'
+ ] %}
- {% endif %}
-
-{% elif install_type == 'source' %}
- {% if base_package_type == 'rpm' %}
-
- {% set nova_spicehtml5proxy_packages = [
- 'python3-numpy',
- 'spice-html5'
- ] %}
-
- {% elif base_package_type == 'deb' %}
-
- {% set nova_spicehtml5proxy_packages = [
- 'spice-html5',
- 'websockify'
- ] %}
-
- {% endif %}
{% endif %}
{{ macros.install_packages(nova_spicehtml5proxy_packages | customizable("packages")) }}
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 22:01:02 +0000