Use general BindHostContext().

hooks/charmhelpers/contrib/openstack/context.py

@@ -801,3 +801,16 @@ class SyslogContext(OSContextGenerator):
             'use_syslog': config('use-syslog')
         }
         return ctxt
+
+
+class BindHostContext(OSContextGenerator):
+
+    def __call__(self):
+        if config('prefer-ipv6'):
+            return {
+                'bind_host': '::'
+            }
+        else:
+            return {
+                'bind_host': '0.0.0.0'
+            }

hooks/swift_context.py

@@ -246,15 +246,3 @@ class SwiftHashContext(OSContextGenerator):
             'swift_hash': get_swift_hash()
         }
         return ctxt
-
-
-class SwiftIPv6Context(OSContextGenerator):
-
-    def __call__(self):
-        ctxt = {}
-        if config('prefer-ipv6'):
-            ctxt['bind_ip'] = '::'
-        else:
-            ctxt['bind_ip'] = '0.0.0.0'
-
-        return ctxt

hooks/swift_hooks.py

@@ -294,7 +294,8 @@ def ha_relation_joined():
             )
             vip_group.append(vip_key)
 
-    relation_set(groups={'grp_swift_vips': ' '.join(vip_group)})
+    if len(vip_group) >= 1:
+        relation_set(groups={'grp_swift_vips': ' '.join(vip_group)})
 
     init_services = {
         'res_swift_haproxy': 'haproxy'

hooks/swift_utils.py

@@ -82,7 +82,7 @@ CONFIG_FILES = OrderedDict([
     }),
     (SWIFT_PROXY_CONF, {
         'hook_contexts': [swift_context.SwiftIdentityContext(),
-                          swift_context.SwiftIPv6Context()],
+                          context.BindHostContext()],
         'services': ['swift-proxy'],
     }),
     (HAPROXY_CONF, {

templates/icehouse/proxy-server.conf

@@ -2,7 +2,7 @@
 bind_port = {{ bind_port }}
 workers = {{ workers }}
 user = swift
-bind_ip = {{ bind_ip }}
+bind_ip = {{ bind_host }}
 {% if ssl %}
 cert_file = {{ ssl_cert }}
 key_file = {{ ssl_key }}