openstack/charm-percona-cluster
Code Issues Proposed changes

[hopem,r=]

Browse Source 
Improve shared-db rel logging
Closes-Bug: 1512293
This commit is contained in:
Edward Hope-Morley
2015-11-02 10:37:02 +00:00
parent 3ccb536f9a
commit b3d57daa2e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hooks/percona_hooks.py
View File

@@ -359,8 +359,12 @@ def get_db_host(client_hostname):
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 access_network is not None:
if not is_address_in_network(access_network, client_ip):
log("Host '%s' not in access-network '%s' - ignoring" %
(client_ip, access_network), level=INFO)
return
if is_clustered():
for vip in vips:
if is_address_in_network(access_network, vip):
@@ -448,6 +452,8 @@ def shared_db_changed(relation_id=None, unit=None):
# 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