Merge lp:~hopem/charms/trusty/percona-cluster/lp1512293 into lp:~openstack-charmers-archive/charms/trusty/percona-cluster/next

[Edward Hope-Morley]

[Liam Young (gnuoy)]

See inline comment

review: Needs Fixing

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

charm_unit_test #12923 percona-cluster-next for hopem mp277548
    UNIT OK: passed

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

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

charm_lint_check #13862 percona-cluster-next for hopem mp277548
    LINT OK: passed

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

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

charm_amulet_test #7899 percona-cluster-next for hopem mp277548
    AMULET OK: passed

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

[Liam Young (gnuoy)]

Approved.

review: Approve

=== modified file 'hooks/percona_hooks.py'
--- hooks/percona_hooks.py	2015-10-29 12:30:18 +0000
+++ hooks/percona_hooks.py	2015-11-16 10:19:07 +0000
@@ -356,24 +356,38 @@
 
 
 def get_db_host(client_hostname):
+    """Get address of local database host.
+
+    If an access-network has been configured, expect selected address to be
+    on that network. If none can be found, revert to primary address.
+
+    If vip(s) are configured, chooses first available.
+    """
     vips = config('vip').split() if config('vip') else []
-    client_ip = get_host_ip(client_hostname)
     access_network = config('access-network')
-    if (access_network is not None and
-            is_address_in_network(access_network, client_ip)):
-        if is_clustered():
-            for vip in vips:
-                if is_address_in_network(access_network, vip):
-                    return vip
-        else:
-            return get_address_in_network(access_network)
-    elif is_clustered():
-        return config('vip')  # NOTE on private network
-    else:
-        if config('prefer-ipv6'):
-            return get_ipv6_addr(exc_list=vips)[0]
-        else:
-            return unit_get('private-address')
+    if access_network:
+        client_ip = get_host_ip(client_hostname)
+        if is_address_in_network(access_network, client_ip):
+            if is_clustered():
+                for vip in vips:
+                    if is_address_in_network(access_network, vip):
+                        return vip
+
+                log("Unable to identify a VIP in the access-network '%s'" %
+                    (access_network), level=WARNING)
+            else:
+                return get_address_in_network(access_network)
+        else:
+            log("Client address '%s' not in access-network '%s'" %
+                (client_ip, access_network), level=WARNING)
+
+    if is_clustered() and vips:
+        return vips[0]  # NOTE on private network
+
+    if config('prefer-ipv6'):
+        return get_ipv6_addr(exc_list=vips)[0]
+
+    return unit_get('private-address')
 
 
 def configure_db_for_hosts(hosts, database, username, db_helper):
@@ -420,14 +434,6 @@
         return
 
     settings = relation_get(unit=unit, rid=relation_id)
-    if is_clustered():
-        db_host = config('vip')
-    else:
-        if config('prefer-ipv6'):
-            db_host = get_ipv6_addr(exc_list=[config('vip')])[0]
-        else:
-            db_host = unit_get('private-address')
-
     access_network = config('access-network')
     db_helper = get_db_helper()
 
@@ -448,6 +454,8 @@
             #       database access if remote unit has presented a
             #       hostname or ip address thats within the configured
             #       network cidr
+            log("Host '%s' not in access-network '%s' - ignoring" %
+                (normalized_address, access_network), level=INFO)
             return
 
         # NOTE: do this before querying access grants