diff options
| author | Zuul <zuul@review.opendev.org> | 2020-12-17 12:19:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-12-17 12:19:36 +0000 |
| commit | 1d36ae464830061473302e2ddc563e9c229aed5c (patch) | |
| tree | ae9140f9396922c3bf51af6042be50fdb322016c | |
| parent | a8b6d26d27b879a0c9ac75ace215172218ee91af (diff) | |
| parent | 6cc97876cc85a8d4d459ff490005bdefa387204d (diff) | |
| download | kolla-1d36ae464830061473302e2ddc563e9c229aed5c.tar.gz kolla-1d36ae464830061473302e2ddc563e9c229aed5c.zip | |
Merge "centos: do not enable PowerTools repo in base"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 3 |
3 files changed, 4 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 3e632a5b6..655f688cb 100644 --- a/docker/base/Dockerfile.j2 +++ b/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 = [ diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index a1120332e..fdaf9107e 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/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 = [ diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index f6f26a804..bea4da6a6 100644 --- a/kolla/template/repos.yaml +++ b/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: |