diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-12-07 20:46:45 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-12-11 19:58:55 +0000 |
| commit | 6cc97876cc85a8d4d459ff490005bdefa387204d (patch) | |
| tree | b86f5035d0733531bb1a9d15f67ff6a1f4153981 | |
| parent | 865f55d4ec408f1e0a5fd8ef4f77edc566c8eb75 (diff) | |
| download | kolla-6cc97876cc85a8d4d459ff490005bdefa387204d.tar.gz kolla-6cc97876cc85a8d4d459ff490005bdefa387204d.zip | |
centos: do not enable PowerTools repo in base
This repo is only needed for source openstack-base.
Change-Id: I835c18424153f8529a37fc78e16d2becacb71263
| -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: |