openstack
/
kolla
Code Issues Proposed changes

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
This commit is contained in:
Marcin Juszkiewicz 2021-04-12 14:32:00 +02:00 committed by Marcin Juszkiewicz
parent 99b82d045b
commit 38fcd184e8
17 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/base/Dockerfile.j2
View File

@ -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',
] %}

1
docker/heat/heat-base/Dockerfile.j2
View File

@ -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' %}

2
docker/kolla-toolbox/Dockerfile.j2
View File

@ -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 = [

2
docker/kuryr/kuryr-libnetwork/Dockerfile.j2
View File

@ -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 }}' \

1
docker/manila/manila-base/Dockerfile.j2
View File

@ -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' %}

1
docker/neutron/neutron-base/Dockerfile.j2
View File

@ -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' %}

2
docker/nova/nova-base/Dockerfile.j2
View File

@ -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' %}

2
docker/nova/nova-libvirt/Dockerfile.j2
View File

@ -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' %}

1
docker/octavia/octavia-base/Dockerfile.j2
View File

@ -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' %}

2
docker/openstack-base/Dockerfile.j2
View File

@ -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' %}

2
docker/openvswitch/openvswitch-base/Dockerfile.j2
View File

@ -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' %}

2
docker/rabbitmq/Dockerfile.j2
View File

@ -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' %}

1
docker/skydive/skydive-base/Dockerfile.j2
View File

@ -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 %}

1
docker/tacker/tacker-base/Dockerfile.j2
View File

@ -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' %}

2
docker/tempest/Dockerfile.j2
View File

@ -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' %}

1
docker/zun/zun-base/Dockerfile.j2
View File

@ -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' %}

6
kolla/template/repos.yaml
View File

@ -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"