diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-04-01 13:41:14 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-04-09 17:44:26 +0200 |
| commit | 1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e (patch) | |
| tree | 05427aa46ce6473684cfe2a824798306291546c9 /docker/nova/nova-base | |
| parent | cabfd0f3eff38e2c10cdc7cf4e9271d72eeca91a (diff) | |
| download | kolla-1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e.tar.gz kolla-1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e.zip | |
docker: drop binary parts
Big patch drops all mentions of binary images support. Suggestions are
welcome how to split it into parts or handle better.
Change-Id: I5d5a46c6ce7734ceb8b844e17b43e359d7cac6e3
Diffstat (limited to 'docker/nova/nova-base')
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 105 |
1 files changed, 31 insertions, 74 deletions
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 \ |