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

[Edward Hope-Morley]

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

charm_lint_check #10689 cinder-next for hopem mp272291
    LINT OK: passed

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

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

charm_unit_test #9870 cinder-next for hopem mp272291
    UNIT OK: passed

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

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

charm_amulet_test #6728 cinder-next for hopem mp272291
    AMULET OK: passed

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

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'hooks/cinder_utils.py'
--- hooks/cinder_utils.py	2015-09-09 20:19:16 +0000
+++ hooks/cinder_utils.py	2015-09-24 16:42:29 +0000
@@ -615,12 +615,11 @@
         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('cinder') < 'liberty':
+        add_source('deb http://archive.ubuntu.com/ubuntu trusty-backports '
+                   'main')
         apt_update()
         apt_install('haproxy/trusty-backports', fatal=True)