From 38fcd184e872bf460a1a65e3342e9806e9b7a05a Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 12 Apr 2021 14:32:00 +0200 Subject: [PATCH] centos: enable repos where needed With RDO use we did not disabled some repositories. This patch disable them and enable where needed. Change-Id: Ia9d537fe9c1ad54789d2bfb4027254fbb3defe7e --- docker/base/Dockerfile.j2 | 12 +++++++++++- docker/heat/heat-base/Dockerfile.j2 | 1 + docker/kolla-toolbox/Dockerfile.j2 | 2 +- docker/kuryr/kuryr-libnetwork/Dockerfile.j2 | 2 ++ docker/manila/manila-base/Dockerfile.j2 | 1 + docker/neutron/neutron-base/Dockerfile.j2 | 1 + docker/nova/nova-base/Dockerfile.j2 | 2 +- docker/nova/nova-libvirt/Dockerfile.j2 | 2 +- docker/octavia/octavia-base/Dockerfile.j2 | 1 + docker/openstack-base/Dockerfile.j2 | 2 +- docker/openvswitch/openvswitch-base/Dockerfile.j2 | 2 ++ docker/rabbitmq/Dockerfile.j2 | 2 +- docker/skydive/skydive-base/Dockerfile.j2 | 1 + docker/tacker/tacker-base/Dockerfile.j2 | 1 + docker/tempest/Dockerfile.j2 | 2 +- docker/zun/zun-base/Dockerfile.j2 | 1 + kolla/template/repos.yaml | 6 ++++++ 17 files changed, 34 insertions(+), 7 deletions(-) diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 5d5bee4fc7..a87c91e082 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -195,8 +195,11 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial # {% set base_centos_yum_repo_packages = [ - 'centos-release-opstools', + 'centos-release-advanced-virtualization', 'centos-release-ceph-nautilus', + 'centos-release-nfv-openvswitch', + 'centos-release-opstools', + 'centos-release-rabbitmq-38', 'epel-release', ] %} @@ -207,8 +210,15 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial {% set base_centos_yum_repos_to_enable = [ ] %} +# FIXME(hrw): entries not starting with 'centos-' (and 'centos-nfv-ovs') need +# to go away - they are from delorean or rdo-release-wallaby package +# https://review.rdoproject.org/r/c/rdo-infra/ansible-role-dlrn/+/33241 {% set base_centos_yum_repos_to_disable = [ + 'advanced-virtualization', + 'centos-nfv-ovs', + 'centos-advanced-virtualization', 'centos-ceph-nautilus', + 'centos-nfv-openvswitch', 'centos-opstools', 'centos-rabbitmq-38', ] %} diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2 index dadf35f526..1a1e2e3b90 100644 --- a/docker/heat/heat-base/Dockerfile.j2 +++ b/docker/heat/heat-base/Dockerfile.j2 @@ -7,6 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} +{{ macros.enable_extra_repos(['openvswitch']) }} {{ macros.configure_user(name='heat') }} {% if install_type == 'binary' %} diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 0508e5a12f..4165693cdd 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -14,7 +14,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='ansible') }} {{ macros.configure_user(name='rabbitmq') }} -{{ macros.enable_extra_repos(['rabbitmq', 'erlang']) }} +{{ macros.enable_extra_repos(['rabbitmq', 'erlang', 'openvswitch', 'powertools']) }} {% if base_package_type == 'rpm' %} {% set kolla_toolbox_packages = [ diff --git a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 b/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 index 4264f7ad1a..333d71ccd1 100644 --- a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 +++ b/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 @@ -7,6 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} +{{ macros.enable_extra_repos(['openvswitch']) }} + {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ diff --git a/docker/manila/manila-base/Dockerfile.j2 b/docker/manila/manila-base/Dockerfile.j2 index 85f2f2c17d..c7397346a3 100644 --- a/docker/manila/manila-base/Dockerfile.j2 +++ b/docker/manila/manila-base/Dockerfile.j2 @@ -7,6 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} +{{ macros.enable_extra_repos(['openvswitch']) }} {{ macros.configure_user(name='manila') }} {% if install_type == 'binary' %} diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index fb72362ef1..40cb801d45 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -7,6 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} +{{ macros.enable_extra_repos(['openvswitch']) }} {{ macros.configure_user(name='neutron') }} {% if install_type == 'binary' %} diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index bded164f26..fe3f13c2d4 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.enable_extra_repos(['libvirt']) }} +{{ macros.enable_extra_repos(['libvirt', 'openvswitch']) }} {{ macros.configure_user(name='nova', groups='qemu') }} {% if install_type == 'binary' %} diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 5613d9d9c0..140c56c240 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='nova', groups='qemu') }} -{{ macros.enable_extra_repos(['ceph', 'libvirt']) }} +{{ macros.enable_extra_repos(['ceph', 'libvirt', 'openvswitch']) }} {% if base_package_type == 'rpm' %} diff --git a/docker/octavia/octavia-base/Dockerfile.j2 b/docker/octavia/octavia-base/Dockerfile.j2 index 8ae291f1ed..7145de8b0b 100644 --- a/docker/octavia/octavia-base/Dockerfile.j2 +++ b/docker/octavia/octavia-base/Dockerfile.j2 @@ -7,6 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} +{{ macros.enable_extra_repos(['openvswitch']) }} {{ macros.configure_user(name='octavia') }} {% if install_type == 'binary' %} diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 278ad0c886..ba5d1f4746 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} {{ macros.add_binary_source_envs() }} -{{ macros.enable_extra_repos(['opstools']) }} +{{ macros.enable_extra_repos(['opstools', 'powertools']) }} {% if install_type == 'binary' %} {% if base_package_type == 'rpm' %} diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2 index d0223c2bb0..5bc40ec471 100644 --- a/docker/openvswitch/openvswitch-base/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-base/Dockerfile.j2 @@ -7,6 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} +{{ macros.enable_extra_repos(['openvswitch']) }} + {% block ovs_install %} {% if base_package_type == 'rpm' %} diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 4b467ec46b..717b074986 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='rabbitmq') }} -{{ macros.enable_extra_repos(['rabbitmq', 'erlang']) }} +{{ macros.enable_extra_repos(['rabbitmq', 'erlang', 'powertools']) }} {% block rabbitmq_install %} {% if base_package_type == 'rpm' %} diff --git a/docker/skydive/skydive-base/Dockerfile.j2 b/docker/skydive/skydive-base/Dockerfile.j2 index b75efd7a45..e5b9390719 100644 --- a/docker/skydive/skydive-base/Dockerfile.j2 +++ b/docker/skydive/skydive-base/Dockerfile.j2 @@ -7,6 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} +{{ macros.enable_extra_repos(['openvswitch']) }} {{ macros.configure_user(name='skydive') }} {% block skydive_install %} diff --git a/docker/tacker/tacker-base/Dockerfile.j2 b/docker/tacker/tacker-base/Dockerfile.j2 index 016594ffeb..4f6733328d 100644 --- a/docker/tacker/tacker-base/Dockerfile.j2 +++ b/docker/tacker/tacker-base/Dockerfile.j2 @@ -7,6 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} +{{ macros.enable_extra_repos(['openvswitch']) }} {{ macros.configure_user(name='tacker') }} {% if install_type == 'binary' %} diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2 index f56742fff8..de3a49358a 100644 --- a/docker/tempest/Dockerfile.j2 +++ b/docker/tempest/Dockerfile.j2 @@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.enable_extra_repos(['powertools']) }} +{{ macros.enable_extra_repos(['openvswitch', 'powertools']) }} {{ macros.configure_user(name='tempest') }} {% if install_type == 'binary' %} diff --git a/docker/zun/zun-base/Dockerfile.j2 b/docker/zun/zun-base/Dockerfile.j2 index a0d425855d..67551c4702 100644 --- a/docker/zun/zun-base/Dockerfile.j2 +++ b/docker/zun/zun-base/Dockerfile.j2 @@ -7,6 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} +{{ macros.enable_extra_repos(['openvswitch']) }} {{ macros.configure_user(name='zun') }} {% if install_type == 'binary' %} diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index fdd986ccf8..b7dfa2aeb0 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -11,7 +11,9 @@ centos: hacluster: "ha" influxdb: "influxdb" kibana: "elasticsearch-kibana-logstash-7.x" + libvirt: "centos-advanced-virtualization" logstash: "elasticsearch-kibana-logstash-7.x" + openvswitch: "centos-nfv-openvswitch" opstools: "centos-opstools" powertools: "powertools" rabbitmq: "rabbitmq_rabbitmq-server" @@ -27,7 +29,9 @@ centos-aarch64: grafana: "grafana" hacluster: "ha" kibana: "elasticsearch-kibana-logstash-7.x" + libvirt: "centos-advanced-virtualization" logstash: "elasticsearch-kibana-logstash-7.x" + openvswitch: "centos-nfv-openvswitch" opstools: "centos-opstools" powertools: "powertools" rabbitmq: "rabbitmq_rabbitmq-server" @@ -40,7 +44,9 @@ centos-ppc64le: epel-modular: "epel-modular" extras: "extras" hacluster: "ha" + libvirt: "centos-advanced-virtualization" logstash: "elasticsearch-kibana-logstash-7.x" + openvswitch: "centos-nfv-openvswitch" opstools: "centos-opstools" powertools: "powertools" rabbitmq: "rabbitmq_rabbitmq-server"