From b0a845554b09b995722267a149b94f1bb8903829 Mon Sep 17 00:00:00 2001
From: Adam Harwell <flux.adam@gmail.com>
Date: Tue, 27 Feb 2018 23:32:50 +0000
Subject: [PATCH] Update HAProxy version for Centos
ALso tweak the systemd service config for haproxy 1.8 since it no longer
ships with a systemd wrapper.
Change-Id: If4f230dcba8c360c919f6c2d93705bf67089b2cf
---
elements/haproxy-octavia/pkg-map | 3 +++
elements/haproxy-octavia/pre-install.d/01-backports | 8 ++++++++
2 files changed, 11 insertions(+)
diff --git a/elements/haproxy-octavia/pkg-map b/elements/haproxy-octavia/pkg-map
index 5fdfd12b4d..539126f48c 100644
--- a/elements/haproxy-octavia/pkg-map
+++ b/elements/haproxy-octavia/pkg-map
@@ -9,6 +9,9 @@
"distro": {
"ubuntu": {
"haproxy": "haproxy"
+ },
+ "centos7": {
+ "haproxy": "haproxy18"
}
},
"family": {
diff --git a/elements/haproxy-octavia/pre-install.d/01-backports b/elements/haproxy-octavia/pre-install.d/01-backports
index a6eb639cb3..570428e1e0 100755
--- a/elements/haproxy-octavia/pre-install.d/01-backports
+++ b/elements/haproxy-octavia/pre-install.d/01-backports
@@ -6,4 +6,12 @@ set -o xtrace
if [ "$DISTRO_NAME" == "ubuntu" ] && [ "$DIB_RELEASE" == "trusty" ]; then
echo deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse > /etc/apt/sources.list.d/backports.list
+elif [ "$DISTRO_NAME" == "centos7" ]; then
+ cat > /etc/yum.repos.d/CentOS-PaaS.repo <<EOF
+[paas]
+name=CentOS-7 - PaaS
+baseurl=http://mirror.centos.org/centos/7/paas/\$basearch/openshift-origin/
+gpgcheck=0
+enabled=1
+EOF
fi