diff options
| author | Zuul <zuul@review.opendev.org> | 2022-09-28 17:59:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-09-28 17:59:40 +0000 |
| commit | 4a94fb4d16da2f9e666cfd9dede38d1719bdf795 (patch) | |
| tree | 0a9a17b97954133949c51f4f3b1848e5ff823b27 | |
| parent | 7a42617e2ec6e445618bc6624410c85cff559533 (diff) | |
| parent | 042a95be10514409323e2a3144f37e507359e3ce (diff) | |
| download | kolla-4a94fb4d16da2f9e666cfd9dede38d1719bdf795.tar.gz kolla-4a94fb4d16da2f9e666cfd9dede38d1719bdf795.zip | |
Merge "repos: in CentOS Stream 9 haproxy is in appstream repo"
| -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" |