From 685aa5939b9d8ba42c4dcb183e61ee058f09ce64 Mon Sep 17 00:00:00 2001
From: "james.page@ubuntu.com" <>
Date: Wed, 2 Jul 2014 09:05:06 +0100
Subject: [PATCH] Resync helpers

---
 .bzrignore                                    |  2 ++
 Makefile                                      | 16 +++++++++---
 hooks/charmhelpers/contrib/network/ip.py      | 26 +++++++++++++++++++
 .../charmhelpers/contrib/openstack/context.py | 17 ++++++++++++
 4 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 .bzrignore

diff --git a/.bzrignore b/.bzrignore
new file mode 100644
index 0000000..a2c7a09
--- /dev/null
+++ b/.bzrignore
@@ -0,0 +1,2 @@
+bin
+.coverage
diff --git a/Makefile b/Makefile
index 1fd305c..63317c4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,22 @@
 #!/usr/bin/make
+PYTHON := /usr/bin/env python
 
 lint:
 	@flake8 --exclude hooks/charmhelpers hooks
 	@flake8 unit_tests
 	@charm proof
 
-sync:
-	@charm-helper-sync -c charm-helpers.yaml
-
 test:
 	@$(PYTHON) /usr/bin/nosetests --nologcapture --with-coverage  unit_tests
+
+bin/charm_helpers_sync.py:
+	@mkdir -p bin
+	@bzr cat lp:charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py \
+        > bin/charm_helpers_sync.py
+
+sync: bin/charm_helpers_sync.py
+	@$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers.yaml
+
+publish: lint test
+	bzr push lp:charms/keystone
+	bzr push lp:charms/trusty/keystone
diff --git a/hooks/charmhelpers/contrib/network/ip.py b/hooks/charmhelpers/contrib/network/ip.py
index 15a6731..f2fa263 100644
--- a/hooks/charmhelpers/contrib/network/ip.py
+++ b/hooks/charmhelpers/contrib/network/ip.py
@@ -67,3 +67,29 @@ def get_address_in_network(network, fallback=None, fatal=False):
         not_found_error_out()
 
     return None
+
+
+def is_address_in_network(network, address):
+    """
+    Determine whether the provided address is within a network range.
+
+    :param network (str): CIDR presentation format. For example,
+        '192.168.1.0/24'.
+    :param address: An individual IPv4 or IPv6 address without a net
+        mask or subnet prefix. For example, '192.168.1.1'.
+    :returns boolean: Flag indicating whether address is in network.
+    """
+    try:
+        network = netaddr.IPNetwork(network)
+    except (netaddr.core.AddrFormatError, ValueError):
+        raise ValueError("Network (%s) is not in CIDR presentation format" %
+                         network)
+    try:
+        address = netaddr.IPAddress(address)
+    except (netaddr.core.AddrFormatError, ValueError):
+        raise ValueError("Address (%s) is not in correct presentation format" %
+                         address)
+    if address in network:
+        return True
+    else:
+        return False
diff --git a/hooks/charmhelpers/contrib/openstack/context.py b/hooks/charmhelpers/contrib/openstack/context.py
index aea11b3..b21fca6 100644
--- a/hooks/charmhelpers/contrib/openstack/context.py
+++ b/hooks/charmhelpers/contrib/openstack/context.py
@@ -21,6 +21,7 @@ from charmhelpers.core.hookenv import (
     relation_get,
     relation_ids,
     related_units,
+    relation_set,
     unit_get,
     unit_private_ip,
     ERROR,
@@ -42,6 +43,8 @@ from charmhelpers.contrib.openstack.neutron import (
     neutron_plugin_attribute,
 )
 
+from charmhelpers.contrib.network.ip import get_address_in_network
+
 CA_CERT_PATH = '/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt'
 
 
@@ -134,8 +137,22 @@ class SharedDBContext(OSContextGenerator):
                 'Missing required charm config options. '
                 '(database name and user)')
             raise OSContextError
+
         ctxt = {}
 
+        # NOTE(jamespage) if mysql charm provides a network upon which
+        # access to the database should be made, reconfigure relation
+        # with the service units local address and defer execution
+        access_network = relation_get('access-network')
+        if access_network is not None:
+            access_hostname = get_address_in_network(access_network,
+                                                     unit_get('private-address'))
+            set_hostname = relation_get(attribute='hostname',
+                                        unit=local_unit())
+            if set_hostname != access_hostname:
+                relation_set(hostname=access_hostname)
+                return ctxt  # Defer any further hook execution for now....
+
         password_setting = 'password'
         if self.relation_prefix:
             password_setting = self.relation_prefix + '_password'