Browse Source

CentOS: disable more repos

'messaging-rabbitmq' and 'opstools' are enabled by RDO
delorean-deps.repo file

'influxdb' was also enabled

Depends-On: https://review.opendev.org/728687

Change-Id: Ibb0a7edc9e5632c1b89a7d52601f55a223b49dfb
changes/32/725032/8
Marcin Juszkiewicz 2 years ago
parent
commit
1dfd937cba
  1. 2
      docker/base/Dockerfile.j2
  2. 2
      docker/base/influxdb.repo
  3. 2
      docker/collectd/Dockerfile.j2
  4. 2
      docker/openstack-base/Dockerfile.j2
  5. 2
      docker/telegraf/Dockerfile.j2
  6. 13
      kolla/template/repos.yaml

2
docker/base/Dockerfile.j2

@ -217,6 +217,8 @@ COPY ceph.repo /etc/yum.repos.d/
{% set base_centos_yum_repos_to_disable = [
'centos-ceph-nautilus',
'centos-nfs-ganesha28',
'centos-opstools',
'centos-rabbitmq-38',
] %}
{% if base_arch == 'x86_64' %}

2
docker/base/influxdb.repo

@ -1,6 +1,6 @@
[influxdb]
name = InfluxDB Repository - RHEL $releasever
baseurl = https://repos.influxdata.com/rhel/$releasever/$basearch/stable
enabled = 1
enabled = 0
gpgcheck = 1
gpgkey = https://repos.influxdata.com/influxdb.key

2
docker/collectd/Dockerfile.j2

@ -9,6 +9,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='collectd') }}
{{ macros.enable_extra_repos(['opstools']) }}
{% set collectd_packages = [
'collectd'
] %}

2
docker/openstack-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(['opstools']) }}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}

2
docker/telegraf/Dockerfile.j2

@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='telegraf', homedir='/etc/telegraf') }}
{{ macros.enable_extra_repos(['influxdb']) }}
{{ macros.enable_extra_repos(['influxdb', 'opstools']) }}
{% set telegraf_packages = [
'chrony',

13
kolla/template/repos.yaml

@ -12,7 +12,7 @@ centos:
influxdb: "influxdb"
kibana: "elasticsearch-kibana-logstash-6.x"
nfs-ganesha: "centos-nfs-ganesha28"
opstools: "centos-release-opstools"
opstools: "centos-opstools"
rabbitmq: "rabbitmq_rabbitmq-server"
td-agent: "treasuredata"
@ -26,7 +26,7 @@ centos-aarch64:
grafana: "grafana"
hacluster: "HighAvailability"
nfs-ganesha: "centos-nfs-ganesha28"
opstools: "centos-release-opstools"
opstools: "centos-opstools"
rabbitmq: "rabbitmq_rabbitmq-server"
centos-ppc64le:
@ -37,11 +37,14 @@ centos-ppc64le:
extras: "extras"
hacluster: "HighAvailability"
nfs-ganesha: "centos-nfs-ganesha28"
opstools: "centos-release-opstools"
opstools: "centos-opstools"
rabbitmq: "rabbitmq_rabbitmq-server"
# NOTE(hrw): empty dict to avoid TypeError
rhel: {}
rhel:
erlang: "centos-rabbitmq-38"
hacluster: "HighAvailability"
opstools: "centos-opstools"
rabbitmq: "centos-rabbitmq-38"
debian:
elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"

Loading…
Cancel
Save