Add support for rpm to repos.yaml

Add the ability to configure repositories in the same
way as we do Debuntu ones - via repos.yaml.

Removes .repo files from base - since these are not
needed there anymore.

gpgcheck = 1 is default in docker/base/dnf.conf

Change-Id: I7df7d452c45c57c434d5b4ad15a87963e4d6d0d4
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>

12 files changed, 1 insertions, 150 deletions

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index e0d95ff99..3ea1e5bc6 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -54,46 +54,12 @@ COPY dnf.conf /etc/dnf/dnf.conf
 {% endblock %}
 
 #### BEGIN REPO ENABLEMENT
-{% set base_yum_repo_files = [
-    'docker-ce.repo',
-    'grafana.repo',
-    'influxdb.repo',
-    'kolla_el10.repo',
-    'mariadb.repo',
-    'opensearch.repo',
-    'proxysql.repo',
-    'rabbitmq_rabbitmq-server.repo',
-    'td.repo',
-] %}
-
 {% set base_yum_url_packages = [
 ] %}
 
 {% set base_yum_repo_keys = [
 ] %}
 
-{% if base_arch == 'x86_64' %}
-    {% set base_yum_repo_files = base_yum_repo_files + [
-        'rabbitmq_rabbitmq-erlang.repo',
-    ] %}
-
-{% elif base_arch == 'aarch64' %}
-    {% set base_yum_repo_files = base_yum_repo_files + [
-        'copr-rabbitmq-erlang.repo',
-    ] %}
-
-{#
-SHA1 keys are not supported in RHEL9: https://github.com/rpm-software-management/rpm/issues/1977
-        'https://packages.erlang-solutions.com/rpm/erlang_solutions.asc',
- #}
-    {% set base_yum_repo_keys = base_yum_repo_keys + [
-    ] %}
-{% endif %}
-
-{%- for repo_file in base_yum_repo_files | customizable('yum_repo_files') %}
-COPY {{ repo_file }} /etc/yum.repos.d/{{ repo_file }}
-{%- endfor %}
-
 {% block base_centos_repo_overrides_post_copy %}{% endblock %}
 
 # Install what is needed for en_US.UTF-8
@@ -142,24 +108,9 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
 {% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
     'dnf-plugins-core'
 ] %}
-{% set base_centos_yum_repos_to_enable = [
-] %}
-
-{% set base_centos_yum_repos_to_disable = [
-    'centos-ceph-squid',
-    'centos-nfv-openvswitch',
-    'epel',
-    'influxdb',
-    'opensearch-3.x',
-    'opensearch-dashboards-3.x',
-] %}
 
 RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }}
 
-{%- for repo in base_centos_yum_repos_to_enable | customizable('centos_yum_repos_to_enable') %} && dnf config-manager --enable {{ repo }} {% endfor -%}
-
-{%- for repo in base_centos_yum_repos_to_disable | customizable('centos_yum_repos_to_disable') %} && dnf config-manager --disable {{ repo }} {% endfor -%}
-
 {%- for key in base_centos_yum_repo_keys | customizable('centos_yum_repo_keys') %} && rpm --import {{ key }} {% endfor %} \
 {% block base_centos_repo_overrides_post_yum %}{% endblock -%}
     && {{ macros.rpm_security_update(clean_package_cache) }}
@@ -203,8 +154,7 @@ RUN dnf config-manager --save --setopt=*.metalink="https://mirrors.fedoraproject
 
 # Install base packages
 {{ macros.enable_extra_repos(['epel']) }}
-{{ macros.install_packages( base_centos_packages | customizable("centos_packages") | customizable("centos_binary_packages") | customizable("centos_source_packages") ) }}
-{{ macros.disable_extra_repos(['epel']) }}
+{{ macros.install_packages(base_centos_packages | customizable("centos_packages") | customizable("centos_binary_packages") | customizable("centos_source_packages")) }}
 
 {# endif for base_package_type rpm #}
 {% elif base_package_type == 'deb' %}
diff --git a/docker/base/copr-rabbitmq-erlang.repo b/docker/base/copr-rabbitmq-erlang.repo
deleted file mode 100644
index fdfbf269a..000000000
--- a/docker/base/copr-rabbitmq-erlang.repo
+++ /dev/null
@@ -1,11 +0,0 @@
-# NOTE(hrw): this repository contains rebuild of Erlang package from RabbitMQ team
-# from https://github.com/rabbitmq/erlang-rpm/
-# Thanks to COPR we have aarch64 packages for Rocky Linux
-
-[copr-rabbitmq-erlang]
-name=openstack-kolla COPR with Erlang build for RabbitMQ
-baseurl=https://download.copr.fedorainfracloud.org/results/@openstack-kolla/rabbitmq-erlang-27/rhel-$releasever-aarch64/
-gpgcheck=1
-enabled=0
-gpgkey=https://download.copr.fedorainfracloud.org/results/@openstack-kolla/rabbitmq-erlang-27/pubkey.gpg
-repo_gpgcheck=0
diff --git a/docker/base/docker-ce.repo b/docker/base/docker-ce.repo
deleted file mode 100644
index 9698823b9..000000000
--- a/docker/base/docker-ce.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[docker-ce]
-name=Docker CE Stable - $basearch
-baseurl=https://download.docker.com/linux/centos/$releasever/$basearch/stable
-enabled=0
-gpgcheck=1
-gpgkey=https://download.docker.com/linux/centos/gpg
diff --git a/docker/base/grafana.repo b/docker/base/grafana.repo
deleted file mode 100644
index 002ac8929..000000000
--- a/docker/base/grafana.repo
+++ /dev/null
@@ -1,8 +0,0 @@
-[grafana]
-name=grafana
-baseurl=https://rpm.grafana.com
-enabled=0
-gpgcheck=1
-gpgkey=https://rpm.grafana.com/gpg.key
-sslverify=1
-sslcacert=/etc/pki/tls/certs/ca-bundle.crt
diff --git a/docker/base/influxdb.repo b/docker/base/influxdb.repo
deleted file mode 100644
index ae63c20be..000000000
--- a/docker/base/influxdb.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[influxdb]
-name = InfluxDB Repository - RHEL $releasever
-baseurl = https://repos.influxdata.com/stable/$basearch/main
-enabled = 0
-gpgcheck = 1
-gpgkey = https://repos.influxdata.com/influxdata-archive.key
diff --git a/docker/base/kolla_el10.repo b/docker/base/kolla_el10.repo
deleted file mode 100644
index b1ffee675..000000000
--- a/docker/base/kolla_el10.repo
+++ /dev/null
@@ -1,10 +0,0 @@
-[kolla_el10]
-name=Copr repo for el10-missing owned by @openstack-kolla
-baseurl=https://download.copr.fedorainfracloud.org/results/@openstack-kolla/el10-missing/epel-10-$basearch/
-type=rpm-md
-skip_if_unavailable=True
-gpgcheck=1
-gpgkey=https://download.copr.fedorainfracloud.org/results/@openstack-kolla/el10-missing/pubkey.gpg
-repo_gpgcheck=0
-enabled=0
-enabled_metadata=1
diff --git a/docker/base/mariadb.repo b/docker/base/mariadb.repo
deleted file mode 100644
index 07d97ef20..000000000
--- a/docker/base/mariadb.repo
+++ /dev/null
@@ -1,7 +0,0 @@
-[mariadb]
-name = MariaDB Server
-baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.11/yum/rhel/$releasever/$basearch
-gpgcheck = 1
-enabled = 0
-module_hotfixes = 1
-gpgkey = https://downloads.mariadb.com/MariaDB/RPM-GPG-KEY-MariaDB
diff --git a/docker/base/opensearch.repo b/docker/base/opensearch.repo
deleted file mode 100644
index 63caa75f8..000000000
--- a/docker/base/opensearch.repo
+++ /dev/null
@@ -1,19 +0,0 @@
-[opensearch-3.x]
-name=OpenSearch 3.x
-baseurl=https://artifacts.opensearch.org/releases/bundle/opensearch/3.x/yum
-enabled=0
-repo_gpgcheck=1
-gpgcheck=1
-gpgkey=https://artifacts.opensearch.org/publickeys/opensearch-release.pgp
-autorefresh=1
-type=rpm-md
-
-[opensearch-dashboards-3.x]
-name=OpenSearch Dashboards 3.x
-baseurl=https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/3.x/yum
-enabled=0
-repo_gpgcheck=1
-gpgcheck=1
-gpgkey=https://artifacts.opensearch.org/publickeys/opensearch-release.pgp
-autorefresh=1
-type=rpm-md
diff --git a/docker/base/proxysql.repo b/docker/base/proxysql.repo
deleted file mode 100644
index 1bd2c55c3..000000000
--- a/docker/base/proxysql.repo
+++ /dev/null
@@ -1,7 +0,0 @@
-[proxysql]
-name = ProxySQL
-# NOTE(mnasiadka): No EL10 packages yet
-baseurl = https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/almalinux/9
-gpgkey = https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/repo_pub_key
-gpgcheck = 1
-enabled = 0
diff --git a/docker/base/rabbitmq_rabbitmq-erlang.repo b/docker/base/rabbitmq_rabbitmq-erlang.repo
deleted file mode 100644
index 82b0441e0..000000000
--- a/docker/base/rabbitmq_rabbitmq-erlang.repo
+++ /dev/null
@@ -1,9 +0,0 @@
-[rabbitmq_rabbitmq-erlang]
-name=rabbitmq_rabbitmq-erlang
-# Use a set of mirrors maintained by the RabbitMQ core team.
-# The mirrors have significantly higher bandwidth quotas.
-baseurl=https://yum1.rabbitmq.com/erlang/el/9/$basearch
-        https://yum2.rabbitmq.com/erlang/el/9/$basearch
-gpgcheck=1
-enabled=0
-gpgkey=https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key
diff --git a/docker/base/rabbitmq_rabbitmq-server.repo b/docker/base/rabbitmq_rabbitmq-server.repo
deleted file mode 100644
index 0680c11e1..000000000
--- a/docker/base/rabbitmq_rabbitmq-server.repo
+++ /dev/null
@@ -1,9 +0,0 @@
-[rabbitmq_rabbitmq-server]
-name=rabbitmq_rabbitmq-server
-baseurl=https://yum2.rabbitmq.com/rabbitmq/el/9/noarch
-        https://yum1.rabbitmq.com/rabbitmq/el/9/noarch
-gpgcheck=1
-enabled=0
-# Cloudsmith's repository key and RabbitMQ package signing key
-gpgkey=https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key
-       https://github.com/rabbitmq/signing-keys/releases/download/3.0/rabbitmq-release-signing-key.asc
diff --git a/docker/base/td.repo b/docker/base/td.repo
deleted file mode 100644
index 8212817fa..000000000
--- a/docker/base/td.repo
+++ /dev/null
@@ -1,7 +0,0 @@
-[fluent-package-lts]
-name=Fluentd Project
-# NOTE(mnasiadka): Use EL9 packages for now - 10 are not available yet
-baseurl=https://packages.treasuredata.com/lts/5/redhat/9/$basearch
-gpgcheck=1
-gpgkey=https://packages.treasuredata.com/GPG-KEY-td-agent
-enabled=0