Merge lp:~james-page/charms/trusty/percona-cluster/1497527-stable into lp:~openstack-charmers-archive/charms/trusty/percona-cluster/trunk

[James Page]

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

charm_lint_check #10402 percona-cluster for james-page mp271773
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

LINT Results (max last 2 lines):
make: *** [lint] Error 100
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12513035/
Build: http://10.245.162.77:8080/job/charm_lint_check/10402/

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

charm_unit_test #9548 percona-cluster for james-page mp271773
    UNIT OK: passed

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

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

charm_amulet_test #6546 percona-cluster for james-page mp271773
    AMULET OK: passed

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

=== modified file 'hooks/percona_hooks.py'
--- hooks/percona_hooks.py	2015-08-10 16:40:24 +0000
+++ hooks/percona_hooks.py	2015-09-21 08:06:08 +0000
@@ -426,6 +426,9 @@
     access_network = config('access-network')
     db_helper = get_db_helper()
 
+    peer_store_and_set(relation_id=relation_id,
+                       relation_settings={'access-network': access_network})
+
     singleset = set(['database', 'username', 'hostname'])
     if singleset.issubset(settings):
         # Process a single database configuration
@@ -433,6 +436,15 @@
         database = settings['database']
         username = settings['username']
 
+        normalized_address = get_host_ip(hostname)
+        if access_network and not is_address_in_network(access_network,
+                                                        normalized_address):
+            # NOTE: for configurations using access-network, only setup
+            #       database access if remote unit has presented a
+            #       hostname or ip address thats within the configured
+            #       network cidr
+            return
+
         # NOTE: do this before querying access grants
         password = configure_db_for_hosts(hostname, database, username,
                                           db_helper)
@@ -482,6 +494,16 @@
                 hostname = databases[db]['hostname']
                 username = databases[db]['username']
 
+                normalized_address = get_host_ip(hostname)
+                if (access_network and
+                        not is_address_in_network(access_network,
+                                                  normalized_address)):
+                    # NOTE: for configurations using access-network,
+                    #       only setup database access if remote unit
+                    #       has presented a hostname or ip address
+                    #       thats within the configured network cidr
+                    return
+
                 # NOTE: do this before querying access grants
                 password = configure_db_for_hosts(hostname, database, username,
                                                   db_helper)
@@ -506,9 +528,6 @@
         else:
             log("No return data - not setting relation settings", level=DEBUG)
 
-    peer_store_and_set(relation_id=relation_id,
-                       relation_settings={'access-network': access_network})
-
 
 @hooks.hook('ha-relation-joined')
 def ha_relation_joined():