Merge lp:~hopem/charms/trusty/swift-proxy/lp1499435 into lp:~openstack-charmers-archive/charms/trusty/swift-proxy/next

[Edward Hope-Morley]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #10687 swift-proxy-next for hopem mp272285
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/10687/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #9871 swift-proxy-next for hopem mp272285
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/9871/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6751 swift-proxy-next for hopem mp272285
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6751/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6762 swift-proxy-next for hopem mp272285
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6762/

=== modified file 'lib/swift_utils.py'
--- lib/swift_utils.py	2015-09-17 13:27:01 +0000
+++ lib/swift_utils.py	2015-09-24 16:41:24 +0000
@@ -23,6 +23,7 @@
 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 @@
                "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)