openstack/kolla
Code Issues Proposed changes

centos: do not enable PowerTools repo in base

Browse Source 
This repo is only needed for source openstack-base.

Change-Id: I835c18424153f8529a37fc78e16d2becacb71263
This commit is contained in:
Marcin Juszkiewicz 2020-12-07 20:46:45 +01:00
parent 865f55d4ec
commit 6cc97876cc
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/base/Dockerfile.j2
View File

@ -200,7 +200,6 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
'dnf-plugins-core'
] %}
{% set base_centos_yum_repos_to_enable = [
'powertools',
] %}
{% set base_centos_yum_repos_to_disable = [

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

@ -195,6 +195,7 @@ ENV DEBIAN_FRONTEND noninteractive
{% endif %}
{{ macros.enable_extra_repos(['powertools']) }}
{{ macros.install_packages(openstack_base_packages | customizable("packages")) }}
{% set openstack_base_pip_packages = [

3
kolla/template/repos.yaml
View File

@ -13,6 +13,7 @@ centos:
logstash: "elasticsearch-kibana-logstash-6.x"
kibana: "elasticsearch-kibana-logstash-6.x"
opstools: "centos-opstools"
powertools: "powertools"
rabbitmq: "rabbitmq_rabbitmq-server"
td-agent: "treasuredata"
@ -27,6 +28,7 @@ centos-aarch64:
hacluster: "ha"
logstash: "elasticsearch-kibana-logstash-6.x"
opstools: "centos-opstools"
powertools: "powertools"
rabbitmq: "rabbitmq_rabbitmq-server"
td-agent: "treasuredata"
@ -39,6 +41,7 @@ centos-ppc64le:
hacluster: "ha"
logstash: "elasticsearch-kibana-logstash-6.x"
opstools: "centos-opstools"
powertools: "powertools"
rabbitmq: "rabbitmq_rabbitmq-server"
rhel: