openstack/octavia
Code Issues Proposed changes

Update HAProxy version for Centos

Browse Source 
ALso tweak the systemd service config for haproxy 1.8 since it no longer
ships with a systemd wrapper.

Change-Id: If4f230dcba8c360c919f6c2d93705bf67089b2cf
This commit is contained in:
Adam Harwell
2018-02-27 23:32:50 +00:00
parent f33c461cb9
commit b0a845554b
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
elements/haproxy-octavia/pkg-map
View File

@@ -9,6 +9,9 @@
"distro": { "distro": {
"ubuntu": { "ubuntu": {
"haproxy": "haproxy" "haproxy": "haproxy"
},
"centos7": {
"haproxy": "haproxy18"
} }
}, },
"family": { "family": {

8
elements/haproxy-octavia/pre-install.d/01-backports
View File

@@ -6,4 +6,12 @@ set -o xtrace
if [ "$DISTRO_NAME" == "ubuntu" ] && [ "$DIB_RELEASE" == "trusty" ]; then 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 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 fi