Add haproxy/trusty-backports to support IPv6.

hooks/swift_hooks.py

@@ -44,7 +44,8 @@ from charmhelpers.core.host import (
 )
 from charmhelpers.fetch import (
     apt_install,
-    apt_update
+    apt_update,
+    add_source
 )
 from charmhelpers.payload.execd import execd_preinstall
 
@@ -75,13 +76,25 @@ def install():
     src = config('openstack-origin')
     if src != 'distro':
         openstack.configure_installation_source(src)
+
+    # 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.
+    trusty = lsb_release()['DISTRIB_CODENAME'] == 'trusty'
+    if config('prefer-ipv6') and trusty:
+        add_source('deb http://archive.ubuntu.com/ubuntu trusty-backports'
+                   ' main')
+        add_source('deb-src http://archive.ubuntu.com/ubuntu trusty-backports'
+                   ' main')
+
     apt_update(fatal=True)
     rel = openstack.get_os_codename_install_source(src)
 
     pkgs = determine_packages(rel)
     apt_install(pkgs, fatal=True)
     apt_install(extra_pkgs, fatal=True)
-
+    if config('prefer-ipv6') and trusty:
+        apt_install('haproxy/trusty-backports', fatal=True)
     ensure_swift_dir()
     # initialize new storage rings.
     for ring in SWIFT_RINGS.iteritems():
@@ -164,7 +177,7 @@ def balance_rings():
 @restart_on_change(restart_map())
 def storage_changed():
     if config('prefer-ipv6'):
-        host_ip = get_ipv6_addr()
+        host_ip = relation_get('private-address')
     else:
         host_ip = openstack.get_host_ip(relation_get('private-address'))
     zone = get_zone(config('zone-assignment'))