openstack/charm-nova-cloud-controller
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:32:02 +01:00
parent 308b86eeb4
commit 0bc90edd3c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hooks/nova_cc_utils.py
View File

@ -1056,12 +1056,11 @@ def setup_ipv6():
raise Exception("IPv6 is not supported in the charms for Ubuntu "
"versions less than Trusty 14.04")
# 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('nova-api') < 'liberty':
add_source('deb http://archive.ubuntu.com/ubuntu trusty-backports '
'main')
apt_update()
apt_install('haproxy/trusty-backports', fatal=True)