openstack/kolla
Code Issues Proposed changes

repos: in CentOS Stream 9 haproxy is in appstream repo

Browse Source 
So we do not need to define repo for it like it was in past.

Change-Id: I9e22a43e068490d762c42a7bb491e445a715381b
This commit is contained in:
Marcin Juszkiewicz 2022-09-27 19:05:31 +02:00
parent 2185f817ba
commit 042a95be10
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/haproxy/haproxy/Dockerfile.j2
View File

@ -7,8 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{{ macros.enable_extra_repos(['haproxy']) }}
{{ macros.configure_user(name='haproxy') }} {{ macros.configure_user(name='haproxy') }}
{% set haproxy_packages = [ {% set haproxy_packages = [

2
kolla/template/repos.yaml
View File

@ -8,7 +8,6 @@ centos:
extras: "extras" extras: "extras"
grafana: "grafana" grafana: "grafana"
hacluster: "highavailability" hacluster: "highavailability"
haproxy: "centos-nfv-extras"
influxdb: "influxdb" influxdb: "influxdb"
kibana: "elasticsearch-kibana-logstash-7.x" kibana: "elasticsearch-kibana-logstash-7.x"
logstash: "elasticsearch-kibana-logstash-7.x" logstash: "elasticsearch-kibana-logstash-7.x"
@ -28,7 +27,6 @@ centos-aarch64:
extras: "extras" extras: "extras"
grafana: "grafana" grafana: "grafana"
hacluster: "highavailability" hacluster: "highavailability"
haproxy: "centos-nfv-extras"
kibana: "elasticsearch-kibana-logstash-7.x" kibana: "elasticsearch-kibana-logstash-7.x"
logstash: "elasticsearch-kibana-logstash-7.x" logstash: "elasticsearch-kibana-logstash-7.x"
mariadb: "mariadb" mariadb: "mariadb"