Browse Source

Merge "centos: do not enable PowerTools repo in base"

changes/64/765864/3
Zuul 9 months ago
committed by Gerrit Code Review
parent
commit
1d36ae4648
  1. 1
      docker/base/Dockerfile.j2
  2. 1
      docker/openstack-base/Dockerfile.j2
  3. 3
      kolla/template/repos.yaml

1
docker/base/Dockerfile.j2

@ -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

@ -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

@ -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:

Loading…
Cancel
Save