diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-09-27 19:05:31 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-09-27 19:07:55 +0200 |
| commit | 042a95be10514409323e2a3144f37e507359e3ce (patch) | |
| tree | f04c33dff3dfab38d533eae42e05f31236b4f9dd | |
| parent | 2185f817baf57be9bdb39b3f0dcf3bd05462d3b5 (diff) | |
| download | kolla-042a95be10514409323e2a3144f37e507359e3ce.tar.gz kolla-042a95be10514409323e2a3144f37e507359e3ce.zip | |
repos: in CentOS Stream 9 haproxy is in appstream repo
So we do not need to define repo for it like it was in past.
Change-Id: I9e22a43e068490d762c42a7bb491e445a715381b
| -rw-r--r-- | docker/haproxy/haproxy/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/docker/haproxy/haproxy/Dockerfile.j2 b/docker/haproxy/haproxy/Dockerfile.j2 index 27d4c9189..3d3614fba 100644 --- a/docker/haproxy/haproxy/Dockerfile.j2 +++ b/docker/haproxy/haproxy/Dockerfile.j2 @@ -7,8 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.enable_extra_repos(['haproxy']) }} - {{ macros.configure_user(name='haproxy') }} {% set haproxy_packages = [ diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 916b35da2..0032f1eb0 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -8,7 +8,6 @@ centos: extras: "extras" grafana: "grafana" hacluster: "highavailability" - haproxy: "centos-nfv-extras" influxdb: "influxdb" kibana: "elasticsearch-kibana-logstash-7.x" logstash: "elasticsearch-kibana-logstash-7.x" @@ -28,7 +27,6 @@ centos-aarch64: extras: "extras" grafana: "grafana" hacluster: "highavailability" - haproxy: "centos-nfv-extras" kibana: "elasticsearch-kibana-logstash-7.x" logstash: "elasticsearch-kibana-logstash-7.x" mariadb: "mariadb" |