diff options
| author | Zuul <zuul@review.opendev.org> | 2021-08-30 17:52:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-08-30 17:52:56 +0000 |
| commit | 0ef09f9bbc2b6ff3a42dc75a1a68795eea6f9463 (patch) | |
| tree | 1c1236ef431a633c4ecd6267fd291254b3a22924 | |
| parent | afa230ace202ee952f1fa26c886c10744c01848e (diff) | |
| parent | 2168224aa333030d77a01ba7e727a58aa7560c69 (diff) | |
| download | kolla-0ef09f9bbc2b6ff3a42dc75a1a68795eea6f9463.tar.gz kolla-0ef09f9bbc2b6ff3a42dc75a1a68795eea6f9463.zip | |
Merge "haproxy: Use haproxy 2.2.x"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/haproxy/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 12 | ||||
| -rw-r--r-- | releasenotes/notes/haproxy-22-aeac8a3fa330f972.yaml | 4 |
4 files changed, 21 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 8318d9e6b..4f58d806b 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -155,6 +155,7 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ {% set base_centos_yum_repo_packages = [ 'centos-release-advanced-virtualization', 'centos-release-ceph-nautilus', + 'centos-release-nfv-extras', 'centos-release-nfv-openvswitch', 'centos-release-opstools', 'centos-release-rabbitmq-38', @@ -173,6 +174,7 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ # https://review.rdoproject.org/r/c/rdo-infra/ansible-role-dlrn/+/33241 {% set base_centos_yum_repos_to_disable = [ 'advanced-virtualization', + 'centos-nfv-extras', 'centos-nfv-ovs', 'centos-advanced-virtualization', 'centos-ceph-nautilus', @@ -311,6 +313,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom {% set base_apt_keys = [ {'name': 'erlang', 'keyid': 'F77F1EDA57EBB1CC'}, {'name': 'rabbitmq', 'keyid': 'F6609E60DC62814E'}, + {'name': 'haproxy', 'keyid': 'CFFB779AADC995E4F350A060505D97A41C61B9CD'}, ] %} {# NOTE(hrw): type field defaults to 'asc' which is used for single keys #} diff --git a/docker/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2 index ffacc86e8..41fd0b975 100644 --- a/docker/haproxy/Dockerfile.j2 +++ b/docker/haproxy/Dockerfile.j2 @@ -7,6 +7,8 @@ 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 1d3fc3b17..94e979063 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -9,6 +9,7 @@ centos: extras: "extras" grafana: "grafana" hacluster: "ha" + haproxy: "centos-nfv-extras" influxdb: "influxdb" kibana: "elasticsearch-kibana-logstash-7.x" libvirt: "centos-advanced-virtualization" @@ -28,6 +29,7 @@ centos-aarch64: extras: "extras" grafana: "grafana" hacluster: "ha" + haproxy: "centos-nfv-extras" kibana: "elasticsearch-kibana-logstash-7.x" libvirt: "centos-advanced-virtualization" logstash: "elasticsearch-kibana-logstash-7.x" @@ -139,6 +141,11 @@ ubuntu: suite: "stable" component: "main" gpg_key: "grafana.asc" + haproxy: + url: "http://ppa.launchpad.net/vbernat/haproxy-2.2/ubuntu" + suite: "focal" + component: "main" + gpg_key: "haproxy.gpg" influxdb: url: "https://repos.influxdata.com/ubuntu" suite: "focal" @@ -186,6 +193,11 @@ ubuntu-aarch64: suite: "stable" component: "main" gpg_key: "grafana.asc" + haproxy: + url: "http://ppa.launchpad.net/vbernat/haproxy-2.2/ubuntu" + suite: "focal" + component: "main" + gpg_key: "haproxy.gpg" influxdb: url: "https://repos.influxdata.com/ubuntu" suite: "focal" diff --git a/releasenotes/notes/haproxy-22-aeac8a3fa330f972.yaml b/releasenotes/notes/haproxy-22-aeac8a3fa330f972.yaml new file mode 100644 index 000000000..6499c0169 --- /dev/null +++ b/releasenotes/notes/haproxy-22-aeac8a3fa330f972.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + ``haproxy`` packages have been upgraded to 2.2. |