openstack/kolla
Code Issues Proposed changes

CentOS: disable more repos

Browse Source 
'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
This commit is contained in:
Marcin Juszkiewicz 2020-05-02 18:41:27 +02:00
parent cf06869684
commit 1dfd937cba
6 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/base/Dockerfile.j2
View File

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

2
docker/base/influxdb.repo
View File

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

2
docker/collectd/Dockerfile.j2
View File

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

2
docker/openstack-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 %} {% import "macros.j2" as macros with context %}
{{ macros.enable_extra_repos(['opstools']) }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}

2
docker/telegraf/Dockerfile.j2
View File

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

13
kolla/template/repos.yaml
View File

@ -12,7 +12,7 @@ centos:
influxdb: "influxdb" influxdb: "influxdb"
kibana: "elasticsearch-kibana-logstash-6.x" kibana: "elasticsearch-kibana-logstash-6.x"
nfs-ganesha: "centos-nfs-ganesha28" nfs-ganesha: "centos-nfs-ganesha28"
opstools: "centos-release-opstools" opstools: "centos-opstools"
rabbitmq: "rabbitmq_rabbitmq-server" rabbitmq: "rabbitmq_rabbitmq-server"
td-agent: "treasuredata" td-agent: "treasuredata"
@ -26,7 +26,7 @@ centos-aarch64:
grafana: "grafana" grafana: "grafana"
hacluster: "HighAvailability" hacluster: "HighAvailability"
nfs-ganesha: "centos-nfs-ganesha28" nfs-ganesha: "centos-nfs-ganesha28"
opstools: "centos-release-opstools" opstools: "centos-opstools"
rabbitmq: "rabbitmq_rabbitmq-server" rabbitmq: "rabbitmq_rabbitmq-server"
centos-ppc64le: centos-ppc64le:
@ -37,11 +37,14 @@ centos-ppc64le:
extras: "extras" extras: "extras"
hacluster: "HighAvailability" hacluster: "HighAvailability"
nfs-ganesha: "centos-nfs-ganesha28" nfs-ganesha: "centos-nfs-ganesha28"
opstools: "centos-release-opstools" opstools: "centos-opstools"
rabbitmq: "rabbitmq_rabbitmq-server" 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: debian:
elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"