openstack/charm-swift-proxy
Code Issues Proposed changes

[hopem,r=]

Browse Source 
No more trusty-backports for haproxy >= Liberty

Closes-Bug: 1499435
This commit is contained in:
Edward Hope-Morley 2015-09-24 17:38:39 +01:00
parent 5303f8e64e
commit b291fd2301
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/swift_utils.py
View File

@ -23,6 +23,7 @@ from swift_context import (
import charmhelpers.contrib.openstack.context as context
import charmhelpers.contrib.openstack.templating as templating
from charmhelpers.contrib.openstack.utils import (
os_release,
get_os_codename_package,
get_os_codename_install_source,
configure_installation_source
@ -587,12 +588,11 @@ def setup_ipv6():
"than Trusty 14.04")
raise SwiftProxyCharmException(msg)
# NOTE(xianghui): Need to install haproxy(1.5.3) from trusty-backports
# to support ipv6 address, so check is required to make sure not
# breaking other versions, IPv6 only support for >= Trusty
if ubuntu_rel == 'trusty':
add_source('deb http://archive.ubuntu.com/ubuntu trusty-backports'
' main')
# Need haproxy >= 1.5.3 for ipv6 so for Trusty if we are <= Kilo we need to
# use trusty-backports otherwise we can use the UCA.
if ubuntu_rel == 'trusty' and os_release('swift-proxy') < 'liberty':
add_source('deb http://archive.ubuntu.com/ubuntu trusty-backports '
'main')
apt_update()
apt_install('haproxy/trusty-backports', fatal=True)