Merge "Enable repos only when needed"

11 files changed, 69 insertions, 27 deletions

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 42625af7f..590bec89e 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -177,12 +177,29 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
     'yum-plugin-priorities'
 ] %}
 
+{% if distro_package_manager == 'dnf' %}
+
+    # We need 'dnf config-manager'
+    {% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
+        'dnf-plugins-core'
+    ] %}
+
+{% endif %}
+
 {% set base_centos_yum_repos_to_disable = [
+    'centos-ceph-nautilus',
+    'centos-nfs-ganesha28',
+    'centos-qemu-ev',
+    'influxdb'
 ] %}
 
 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_disable | customizable('centos_yum_repos_to_disable') -%}
+{%- if distro_package_manager == 'dnf' %}
+    && dnf config-manager --disable {{ repo }} \
+{% else %}
     && yum-config-manager --disable {{ repo }} \
+{% endif -%}
 {% endfor -%}
 {% for key in base_centos_yum_repo_keys | customizable('centos_yum_repo_keys') -%}
     && rpm --import {{ key }} \
diff --git a/docker/base/crmsh.repo b/docker/base/crmsh.repo
index 1c3396f75..078407bf2 100644
--- a/docker/base/crmsh.repo
+++ b/docker/base/crmsh.repo
@@ -4,4 +4,4 @@ type=rpm-md
 baseurl=http://download.opensuse.org/repositories/network:/ha-clustering:/Stable/CentOS_CentOS-7/
 gpgcheck=1
 gpgkey=http://download.opensuse.org/repositories/network:/ha-clustering:/Stable/CentOS_CentOS-7/repodata/repomd.xml.key
-enabled=1
+enabled=0
diff --git a/docker/base/elasticsearch.repo b/docker/base/elasticsearch.repo
index a9df03688..16e589be1 100644
--- a/docker/base/elasticsearch.repo
+++ b/docker/base/elasticsearch.repo
@@ -3,6 +3,6 @@ name=ELK repository for 5.x packages
 baseurl=https://artifacts.elastic.co/packages/5.x/yum
 gpgcheck=1
 gpgkey=https://artifacts.elastic.co/GPG-KEY-elasticsearch
-enabled=1
+enabled=0
 autorefresh=1
 type=rpm-md
diff --git a/docker/base/grafana.repo b/docker/base/grafana.repo
index f4b6f1f3f..6fa31af13 100644
--- a/docker/base/grafana.repo
+++ b/docker/base/grafana.repo
@@ -2,7 +2,7 @@
 name=grafana
 baseurl=https://packages.grafana.com/oss/rpm
 repo_gpgcheck=1
-enabled=1
+enabled=0
 gpgcheck=1
 gpgkey=https://packages.grafana.com/gpg.key
 sslverify=1
diff --git a/docker/base/opendaylight.repo b/docker/base/opendaylight.repo
index c1e8798c9..c8659b96f 100644
--- a/docker/base/opendaylight.repo
+++ b/docker/base/opendaylight.repo
@@ -1,5 +1,5 @@
 [opendaylight]
 name=OpenDaylight Carbon
 baseurl=https://nexus.opendaylight.org/content/repositories/opendaylight-carbon-epel-7-x86_64-devel/
-enabled=1
+enabled=0
 gpgcheck=0
diff --git a/docker/base/rabbitmq_rabbitmq-server.repo b/docker/base/rabbitmq_rabbitmq-server.repo
index 82d55cf84..c7965ea70 100644
--- a/docker/base/rabbitmq_rabbitmq-server.repo
+++ b/docker/base/rabbitmq_rabbitmq-server.repo
@@ -3,7 +3,7 @@ name=rabbitmq_rabbitmq-server
 baseurl=https://packagecloud.io/rabbitmq/rabbitmq-server/el/7/$basearch
 repo_gpgcheck=1
 gpgcheck=0
-enabled=1
+enabled=0
 gpgkey=https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
diff --git a/docker/base/sources.list.debian b/docker/base/sources.list.debian
index f07a725dc..5be0171b0 100644
--- a/docker/base/sources.list.debian
+++ b/docker/base/sources.list.debian
@@ -4,18 +4,24 @@ deb http://deb.debian.org/debian buster main
 # debian security updates
 deb http://security.debian.org/debian-security buster/updates main
 
-# elasticsearch (arch:all), logstash (arch:all), kibana (arch:amd64)
-deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main
-
 # main docker repo
 deb https://download.docker.com/linux/debian buster stable
 
-# Grafana repo
-deb https://packages.grafana.com/oss/deb stable main
-
 # Buster - Train repos
 deb http://buster-train.debian.net/debian buster-train-backports main
 deb http://buster-train.debian.net/debian buster-train-backports-nochange main
 
+# NOTE(hrw): repositories below are added into image when they are needed as
+# separate files in /etc/apt/sources.list.d/ directory. For that purpose they
+# are defined in kolla/repos.yaml file.
+#
+# Here they stay in case someone needs them.
+
+# elasticsearch (arch:all), logstash (arch:all), kibana (arch:amd64)
+#deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main
+
+# Grafana repo
+#deb https://packages.grafana.com/oss/deb stable main
+
 # td-agent for fluentd
-deb http://packages.treasuredata.com/3/debian/buster buster contrib
+#deb http://packages.treasuredata.com/3/debian/buster buster contrib
diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu
index 4e8e4d121..144104d07 100644
--- a/docker/base/sources.list.ubuntu
+++ b/docker/base/sources.list.ubuntu
@@ -12,29 +12,35 @@ deb http://archive.ubuntu.com/ubuntu/ bionic-backports main universe
 # are qemu, libvirt, and openvswitch.
 deb http://ubuntu-cloud.archive.canonical.com/ubuntu bionic-updates/train main
 
+# NOTE(hrw): repositories below are added into image when they are needed as
+# separate files in /etc/apt/sources.list.d/ directory. For that purpose they
+# are defined in kolla/repos.yaml file.
+#
+# Here they stay in case someone needs them.
+
 # Elasticsearch, Logstash & Kibana repo
-deb https://artifacts.elastic.co/packages/5.x/apt stable main
+#deb https://artifacts.elastic.co/packages/5.x/apt stable main
 
 # InfluxDB repo
-deb https://repos.influxdata.com/ubuntu bionic stable
+#deb https://repos.influxdata.com/ubuntu bionic stable
 
 # Grafana repo
-deb https://packages.grafana.com/oss/deb stable main
+#deb https://packages.grafana.com/oss/deb stable main
 
 # Fluentd repo
-deb http://packages.treasuredata.com/3/ubuntu/bionic/ bionic contrib
+#deb http://packages.treasuredata.com/3/ubuntu/bionic/ bionic contrib
 
 # Qdrouterd repo
-deb http://ppa.launchpad.net/qpid/released/ubuntu/ bionic main
+#deb http://ppa.launchpad.net/qpid/released/ubuntu/ bionic main
 
 # Sensu repo
-deb https://sensu.global.ssl.fastly.net/apt bionic main
+#deb https://sensu.global.ssl.fastly.net/apt bionic main
 
 # Opendaylight repo
-deb http://ppa.launchpad.net/odl-team/carbon/ubuntu xenial main
+#deb http://ppa.launchpad.net/odl-team/carbon/ubuntu xenial main
 
 # rabbitmq repo
-deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ bionic main
+#deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ bionic main
 
 # MariaDB repo
-deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main
+#deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main
diff --git a/docker/base/sources.list.ubuntu.aarch64 b/docker/base/sources.list.ubuntu.aarch64
index 7169349c1..41a7fb1ea 100644
--- a/docker/base/sources.list.ubuntu.aarch64
+++ b/docker/base/sources.list.ubuntu.aarch64
@@ -10,14 +10,20 @@ deb http://ports.ubuntu.com/ bionic-backports main universe
 # are qemu, libvirt, and openvswitch.
 deb http://ubuntu-cloud.archive.canonical.com/ubuntu bionic-updates/train main
 
+# NOTE(hrw): repositories below are added into image when they are needed as
+# separate files in /etc/apt/sources.list.d/ directory. For that purpose they
+# are defined in kolla/repos.yaml file.
+#
+# Here they stay in case someone needs them.
+
 # rabbitmq repo
-deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ bionic main
+#deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ bionic main
 
 # Grafana repo
-deb https://packages.grafana.com/oss/deb stable main
+#deb https://packages.grafana.com/oss/deb stable main
 
 # elasticsearch (arch:all), logstash (arch:all), kibana (arch:amd64)
-deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main
+#deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main
 
 # MariaDB repo
-deb [arch=arm64] http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main
+#deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main
diff --git a/docker/base/sources.list.ubuntu.ppc64le b/docker/base/sources.list.ubuntu.ppc64le
index 5ffe6e48e..99a4d4b5b 100644
--- a/docker/base/sources.list.ubuntu.ppc64le
+++ b/docker/base/sources.list.ubuntu.ppc64le
@@ -10,8 +10,14 @@ deb http://ports.ubuntu.com/ bionic-backports main universe
 # are qemu, libvirt, and openvswitch.
 deb http://ubuntu-cloud.archive.canonical.com/ubuntu bionic-updates/train main
 
+# NOTE(hrw): repositories below are added into image when they are needed as
+# separate files in /etc/apt/sources.list.d/ directory. For that purpose they
+# are defined in kolla/repos.yaml file.
+#
+# Here they stay in case someone needs them.
+
 # rabbitmq repo
-deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ bionic main
+#deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ bionic main
 
 # MariaDB repo
-deb [arch=ppc64el] http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main
+#deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main
diff --git a/docker/base/td.repo b/docker/base/td.repo
index f4ccce31e..b031678e1 100644
--- a/docker/base/td.repo
+++ b/docker/base/td.repo
@@ -3,3 +3,4 @@ name=TreasureData
 baseurl=http://packages.treasuredata.com/3/redhat/\$releasever/\$basearch
 gpgcheck=1
 gpgkey=https://packages.treasuredata.com/GPG-KEY-td-agent
+enabled=0