Merge lp:~james-page/charm-helpers/lp.1391784 into lp:charm-helpers

[James Page]

Add support for a default backend based on the private addresses of the unit.

This backend is used if none of the frontend subnet acl's match, supporting deployments where is expected that access over any configured network interface on the server should just work.

[lp:~james-page/charm-helpers/lp.1391784]

251. By James Page on 2014-11-20

Rebase

252. By James Page on 2015-01-13

Rebase

253. By James Page on 2015-01-13

Fixup broken test

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2015-01-12 11:20:03 +0000
+++ charmhelpers/contrib/openstack/context.py	2015-01-13 11:56:59 +0000
@@ -468,21 +468,25 @@
                             _unit = unit.replace('/', '-')
                             cluster_hosts[laddr]['backends'][_unit] = _laddr
 
-        # NOTE(jamespage) no split configurations found, just use
-        # private addresses
-        if not cluster_hosts:
-            netmask = get_netmask_for_address(addr)
-            cluster_hosts[addr] = {'network': "{}/{}".format(addr, netmask),
-                                   'backends': {l_unit: addr}}
-            for rid in relation_ids('cluster'):
-                for unit in related_units(rid):
-                    _laddr = relation_get('private-address',
-                                          rid=rid, unit=unit)
-                    if _laddr:
-                        _unit = unit.replace('/', '-')
-                        cluster_hosts[addr]['backends'][_unit] = _laddr
+        # NOTE(jamespage) add backend based on private address - this
+        # with either be the only backend or the fallback if no acls
+        # match in the frontend
+        cluster_hosts[addr] = {}
+        netmask = get_netmask_for_address(addr)
+        cluster_hosts[addr] = {'network': "{}/{}".format(addr, netmask),
+                               'backends': {l_unit: addr}}
+        for rid in relation_ids('cluster'):
+            for unit in related_units(rid):
+                _laddr = relation_get('private-address',
+                                      rid=rid, unit=unit)
+                if _laddr:
+                    _unit = unit.replace('/', '-')
+                    cluster_hosts[addr]['backends'][_unit] = _laddr
 
-        ctxt = {'frontends': cluster_hosts}
+        ctxt = {
+            'frontends': cluster_hosts,
+            'default_backend': addr
+        }
 
         if config('haproxy-server-timeout'):
             ctxt['haproxy_server_timeout'] = config('haproxy-server-timeout')

=== modified file 'charmhelpers/contrib/openstack/templates/haproxy.cfg'
--- charmhelpers/contrib/openstack/templates/haproxy.cfg	2014-12-19 17:05:07 +0000
+++ charmhelpers/contrib/openstack/templates/haproxy.cfg	2015-01-13 11:56:59 +0000
@@ -44,7 +44,9 @@
     {% for frontend in frontends -%}
     acl net_{{ frontend }} dst {{ frontends[frontend]['network'] }}
     use_backend {{ service }}_{{ frontend }} if net_{{ frontend }}
-    {% endfor %}
+    {% endfor -%}
+    default_backend {{ service }}_{{ default_backend }}
+
 {% for frontend in frontends -%}
 backend {{ service }}_{{ frontend }}
     balance leastconn

=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2014-12-19 13:47:43 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2015-01-13 11:56:59 +0000
@@ -1019,6 +1019,7 @@
                     }
                 }
             },
+            'default_backend': 'cluster-peer0.localnet',
             'local_host': '127.0.0.1',
             'haproxy_host': '0.0.0.0',
             'stat_port': ':8888',
@@ -1070,6 +1071,7 @@
                     }
                 }
             },
+            'default_backend': 'cluster-peer0.localnet',
             'local_host': '127.0.0.1',
             'haproxy_host': '0.0.0.0',
             'stat_port': ':8888',
@@ -1144,8 +1146,17 @@
                         'peer-1': 'cluster-peer1.public',
                         'peer-2': 'cluster-peer2.public',
                     }
+                },
+                'cluster-peer0.localnet': {
+                    'network': 'cluster-peer0.localnet/255.255.0.0',
+                    'backends': {
+                        'peer-0': 'cluster-peer0.localnet',
+                        'peer-1': 'cluster-peer1.localnet',
+                        'peer-2': 'cluster-peer2.localnet',
+                    }
                 }
             },
+            'default_backend': 'cluster-peer0.localnet',
             'local_host': '127.0.0.1',
             'haproxy_host': '0.0.0.0',
             'stat_port': ':8888',
@@ -1200,6 +1211,7 @@
                     }
                 }
             },
+            'default_backend': 'cluster-peer0.localnet',
             'local_host': 'ip6-localhost',
             'haproxy_server_timeout': 50000,
             'haproxy_client_timeout': 50000,
@@ -1275,6 +1287,7 @@
                     'network': 'lonely.clusterpeer.howsad/255.255.0.0'
                 },
             },
+            'default_backend': 'lonely.clusterpeer.howsad',
             'haproxy_host': '0.0.0.0',
             'local_host': '127.0.0.1',
             'stat_port': ':8888'