Merge lp:~billy-olsen/charms/trusty/glance/public-endpoint-host into lp:~openstack-charmers-archive/charms/trusty/glance/next

[Billy Olsen]

Provides a config option which allows the user to specify the public hostname used to advertise to keystone when creating endpoints.

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

charm_lint_check #5047 glance-next for billy-olsen mp261009
    LINT OK: passed

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

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

charm_unit_test #4727 glance-next for billy-olsen mp261009
    UNIT OK: passed

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

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

charm_amulet_test #4453 glance-next for billy-olsen mp261009
    AMULET OK: passed

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

[lp:~billy-olsen/charms/trusty/glance/public-endpoint-host]

121. By Billy Olsen on 2015-06-04

c-h sync

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

charm_lint_check #5071 glance-next for billy-olsen mp261009
    LINT OK: passed

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

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

charm_unit_test #4750 glance-next for billy-olsen mp261009
    UNIT OK: passed

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

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

charm_amulet_test #4478 glance-next for billy-olsen mp261009
    AMULET OK: passed

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

[Corey Bryant (corey.bryant)]

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-04-01 16:48:59 +0000
+++ config.yaml	2015-06-04 23:12:46 +0000
@@ -176,6 +176,16 @@
       192.168.0.0/24)
       .
       This network will be used for public endpoints.
+  os-public-hostname:
+    type: string
+    default:
+    description: |
+      The hostname or address of the public endpoints created for glance
+      in the keystone identity provider.
+      .
+      This value will be used for public endpoints. For example, an
+      os-public-hostname set to 'glance.example.com' with ssl enabled will
+      create a public endpoint for glance of https://glance.example.com:9292/
   prefer-ipv6:
     type: boolean
     default: False
 
=== modified file 'hooks/charmhelpers/contrib/hahelpers/cluster.py'
--- hooks/charmhelpers/contrib/hahelpers/cluster.py	2015-03-20 17:15:02 +0000
+++ hooks/charmhelpers/contrib/hahelpers/cluster.py	2015-06-04 23:12:46 +0000
@@ -52,6 +52,8 @@
     bool_from_string,
 )
 
+DC_RESOURCE_NAME = 'DC'
+
 
 class HAIncompleteConfig(Exception):
     pass
@@ -95,6 +97,27 @@
     return False
 
 
+def is_crm_dc():
+    """
+    Determine leadership by querying the pacemaker Designated Controller
+    """
+    cmd = ['crm', 'status']
+    try:
+        status = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
+        if not isinstance(status, six.text_type):
+            status = six.text_type(status, "utf-8")
+    except subprocess.CalledProcessError:
+        return False
+    current_dc = ''
+    for line in status.split('\n'):
+        if line.startswith('Current DC'):
+            # Current DC: juju-lytrusty-machine-2 (168108163) - partition with quorum
+            current_dc = line.split(':')[1].split()[0]
+    if current_dc == get_unit_hostname():
+        return True
+    return False
+
+
 @retry_on_exception(5, base_delay=2, exc_type=CRMResourceNotFound)
 def is_crm_leader(resource, retry=False):
     """
@@ -104,6 +127,8 @@
     We allow this operation to be retried to avoid the possibility of getting a
     false negative. See LP #1396246 for more info.
     """
+    if resource == DC_RESOURCE_NAME:
+        return is_crm_dc()
     cmd = ['crm', 'resource', 'show', resource]
     try:
         status = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
 
=== modified file 'hooks/charmhelpers/contrib/openstack/ip.py'
--- hooks/charmhelpers/contrib/openstack/ip.py	2015-03-20 17:15:02 +0000
+++ hooks/charmhelpers/contrib/openstack/ip.py	2015-06-04 23:12:46 +0000
@@ -17,6 +17,7 @@
 from charmhelpers.core.hookenv import (
     config,
     unit_get,
+    service_name,
 )
 from charmhelpers.contrib.network.ip import (
     get_address_in_network,
@@ -26,8 +27,6 @@
 )
 from charmhelpers.contrib.hahelpers.cluster import is_clustered
 
-from functools import partial
-
 PUBLIC = 'public'
 INTERNAL = 'int'
 ADMIN = 'admin'
@@ -35,15 +34,18 @@
 ADDRESS_MAP = {
     PUBLIC: {
         'config': 'os-public-network',
-        'fallback': 'public-address'
+        'fallback': 'public-address',
+        'override': 'os-public-hostname',
     },
     INTERNAL: {
         'config': 'os-internal-network',
-        'fallback': 'private-address'
+        'fallback': 'private-address',
+        'override': 'os-internal-hostname',
     },
     ADMIN: {
         'config': 'os-admin-network',
-        'fallback': 'private-address'
+        'fallback': 'private-address',
+        'override': 'os-admin-hostname',
     }
 }
 
@@ -57,15 +59,50 @@
     :param endpoint_type: str endpoint type to resolve.
     :param returns: str base URL for services on the current service unit.
     """
-    scheme = 'http'
-    if 'https' in configs.complete_contexts():
-        scheme = 'https'
+    scheme = _get_scheme(configs)
+
     address = resolve_address(endpoint_type)
     if is_ipv6(address):
         address = "[{}]".format(address)
+
     return '%s://%s' % (scheme, address)
 
 
+def _get_scheme(configs):
+    """Returns the scheme to use for the url (either http or https)
+    depending upon whether https is in the configs value.
+
+    :param configs: OSTemplateRenderer config templating object to inspect
+                    for a complete https context.
+    :returns: either 'http' or 'https' depending on whether https is
+              configured within the configs context.
+    """
+    scheme = 'http'
+    if configs and 'https' in configs.complete_contexts():
+        scheme = 'https'
+    return scheme
+
+
+def _get_address_override(endpoint_type=PUBLIC):
+    """Returns any address overrides that the user has defined based on the
+    endpoint type.
+
+    Note: this function allows for the service name to be inserted into the
+    address if the user specifies {service_name}.somehost.org.
+
+    :param endpoint_type: the type of endpoint to retrieve the override
+                          value for.
+    :returns: any endpoint address or hostname that the user has overridden
+              or None if an override is not present.
+    """
+    override_key = ADDRESS_MAP[endpoint_type]['override']
+    addr_override = config(override_key)
+    if not addr_override:
+        return None
+    else:
+        return addr_override.format(service_name=service_name())
+
+
 def resolve_address(endpoint_type=PUBLIC):
     """Return unit address depending on net config.
 
@@ -77,7 +114,10 @@
 
     :param endpoint_type: Network endpoing type
     """
-    resolved_address = None
+    resolved_address = _get_address_override(endpoint_type)
+    if resolved_address:
+        return resolved_address
+
     vips = config('vip')
     if vips:
         vips = vips.split()
@@ -109,38 +149,3 @@
                          "clustered=%s)" % (net_type, clustered))
 
     return resolved_address
-
-
-def endpoint_url(configs, url_template, port, endpoint_type=PUBLIC,
-                 override=None):
-    """Returns the correct endpoint URL to advertise to Keystone.
-
-    This method provides the correct endpoint URL which should be advertised to
-    the keystone charm for endpoint creation. This method allows for the url to
-    be overridden to force a keystone endpoint to have specific URL for any of
-    the defined scopes (admin, internal, public).
-
-    :param configs: OSTemplateRenderer config templating object to inspect
-                    for a complete https context.
-    :param url_template: str format string for creating the url template. Only
-                         two values will be passed - the scheme+hostname
-                        returned by the canonical_url and the port.
-    :param endpoint_type: str endpoint type to resolve.
-    :param override: str the name of the config option which overrides the
-                     endpoint URL defined by the charm itself. None will
-                     disable any overrides (default).
-    """
-    if override:
-        # Return any user-defined overrides for the keystone endpoint URL.
-        user_value = config(override)
-        if user_value:
-            return user_value.strip()
-
-    return url_template % (canonical_url(configs, endpoint_type), port)
-
-
-public_endpoint = partial(endpoint_url, endpoint_type=PUBLIC)
-
-internal_endpoint = partial(endpoint_url, endpoint_type=INTERNAL)
-
-admin_endpoint = partial(endpoint_url, endpoint_type=ADMIN)
 
=== modified file 'hooks/charmhelpers/contrib/openstack/neutron.py'
--- hooks/charmhelpers/contrib/openstack/neutron.py	2015-04-16 19:53:49 +0000
+++ hooks/charmhelpers/contrib/openstack/neutron.py	2015-06-04 23:12:46 +0000
@@ -256,11 +256,14 @@
 def parse_mappings(mappings):
     parsed = {}
     if mappings:
-        mappings = mappings.split(' ')
+        mappings = mappings.split()
         for m in mappings:
             p = m.partition(':')
-            if p[1] == ':':
-                parsed[p[0].strip()] = p[2].strip()
+            key = p[0].strip()
+            if p[1]:
+                parsed[key] = p[2].strip()
+            else:
+                parsed[key] = ''
 
     return parsed
 
@@ -283,13 +286,13 @@
     Returns dict of the form {bridge:port}.
     """
     _mappings = parse_mappings(mappings)
-    if not _mappings:
+    if not _mappings or list(_mappings.values()) == ['']:
         if not mappings:
             return {}
 
         # For backwards-compatibility we need to support port-only provided in
         # config.
-        _mappings = {default_bridge: mappings.split(' ')[0]}
+        _mappings = {default_bridge: mappings.split()[0]}
 
     bridges = _mappings.keys()
     ports = _mappings.values()
@@ -309,6 +312,8 @@
 
     Mappings must be a space-delimited list of provider:start:end mappings.
 
+    The start:end range is optional and may be omitted.
+
     Returns dict of the form {provider: (start, end)}.
     """
     _mappings = parse_mappings(mappings)
 
=== modified file 'hooks/charmhelpers/core/hookenv.py'
--- hooks/charmhelpers/core/hookenv.py	2015-04-16 19:53:49 +0000
+++ hooks/charmhelpers/core/hookenv.py	2015-06-04 23:12:46 +0000
@@ -21,12 +21,14 @@
 #  Charm Helpers Developers <[e-mail]>
 
 from __future__ import print_function
+from functools import wraps
 import os
 import json
 import yaml
 import subprocess
 import sys
 import errno
+import tempfile
 from subprocess import CalledProcessError
 
 import six
@@ -58,15 +60,17 @@
 
     will cache the result of unit_get + 'test' for future calls.
     """
+    @wraps(func)
     def wrapper(*args, **kwargs):
         global cache
         key = str((func, args, kwargs))
         try:
             return cache[key]
         except KeyError:
-            res = func(*args, **kwargs)
-            cache[key] = res
-            return res
+            pass  # Drop out of the exception handler scope.
+        res = func(*args, **kwargs)
+        cache[key] = res
+        return res
     return wrapper
 
 
@@ -178,7 +182,7 @@
 
 def remote_unit():
     """The remote unit for the current relation hook"""
-    return os.environ['JUJU_REMOTE_UNIT']
+    return os.environ.get('JUJU_REMOTE_UNIT', None)
 
 
 def service_name():
@@ -250,6 +254,12 @@
         except KeyError:
             return (self._prev_dict or {})[key]
 
+    def get(self, key, default=None):
+        try:
+            return self[key]
+        except KeyError:
+            return default
+
     def keys(self):
         prev_keys = []
         if self._prev_dict is not None:
@@ -353,18 +363,49 @@
     """Set relation information for the current unit"""
     relation_settings = relation_settings if relation_settings else {}
     relation_cmd_line = ['relation-set']
+    accepts_file = "--file" in subprocess.check_output(
+        relation_cmd_line + ["--help"], universal_newlines=True)
     if relation_id is not None:
         relation_cmd_line.extend(('-r', relation_id))
-    for k, v in (list(relation_settings.items()) + list(kwargs.items())):
-        if v is None:
-            relation_cmd_line.append('{}='.format(k))
-        else:
-            relation_cmd_line.append('{}={}'.format(k, v))
-    subprocess.check_call(relation_cmd_line)
+    settings = relation_settings.copy()
+    settings.update(kwargs)
+    for key, value in settings.items():
+        # Force value to be a string: it always should, but some call
+        # sites pass in things like dicts or numbers.
+        if value is not None:
+            settings[key] = "{}".format(value)
+    if accepts_file:
+        # --file was introduced in Juju 1.23.2. Use it by default if
+        # available, since otherwise we'll break if the relation data is
+        # too big. Ideally we should tell relation-set to read the data from
+        # stdin, but that feature is broken in 1.23.2: Bug #1454678.
+        with tempfile.NamedTemporaryFile(delete=False) as settings_file:
+            settings_file.write(yaml.safe_dump(settings).encode("utf-8"))
+        subprocess.check_call(
+            relation_cmd_line + ["--file", settings_file.name])
+        os.remove(settings_file.name)
+    else:
+        for key, value in settings.items():
+            if value is None:
+                relation_cmd_line.append('{}='.format(key))
+            else:
+                relation_cmd_line.append('{}={}'.format(key, value))
+        subprocess.check_call(relation_cmd_line)
     # Flush cache of any relation-gets for local unit
     flush(local_unit())
 
 
+def relation_clear(r_id=None):
+    ''' Clears any relation data already set on relation r_id '''
+    settings = relation_get(rid=r_id,
+                            unit=local_unit())
+    for setting in settings:
+        if setting not in ['public-address', 'private-address']:
+            settings[setting] = None
+    relation_set(relation_id=r_id,
+                 **settings)
+
+
 @cached
 def relation_ids(reltype=None):
     """A list of relation_ids"""
@@ -509,6 +550,11 @@
         return None
 
 
+def unit_public_ip():
+    """Get this unit's public IP address"""
+    return unit_get('public-address')
+
+
 def unit_private_ip():
     """Get this unit's private IP address"""
     return unit_get('private-address')
@@ -605,3 +651,94 @@
 
     The results set by action_set are preserved."""
     subprocess.check_call(['action-fail', message])
+
+
+def status_set(workload_state, message):
+    """Set the workload state with a message
+
+    Use status-set to set the workload state with a message which is visible
+    to the user via juju status. If the status-set command is not found then
+    assume this is juju < 1.23 and juju-log the message unstead.
+
+    workload_state -- valid juju workload state.
+    message        -- status update message
+    """
+    valid_states = ['maintenance', 'blocked', 'waiting', 'active']
+    if workload_state not in valid_states:
+        raise ValueError(
+            '{!r} is not a valid workload state'.format(workload_state)
+        )
+    cmd = ['status-set', workload_state, message]
+    try:
+        ret = subprocess.call(cmd)
+        if ret == 0:
+            return
+    except OSError as e:
+        if e.errno != errno.ENOENT:
+            raise
+    log_message = 'status-set failed: {} {}'.format(workload_state,
+                                                    message)
+    log(log_message, level='INFO')
+
+
+def status_get():
+    """Retrieve the previously set juju workload state
+
+    If the status-set command is not found then assume this is juju < 1.23 and
+    return 'unknown'
+    """
+    cmd = ['status-get']
+    try:
+        raw_status = subprocess.check_output(cmd, universal_newlines=True)
+        status = raw_status.rstrip()
+        return status
+    except OSError as e:
+        if e.errno == errno.ENOENT:
+            return 'unknown'
+        else:
+            raise
+
+
+def translate_exc(from_exc, to_exc):
+    def inner_translate_exc1(f):
+        def inner_translate_exc2(*args, **kwargs):
+            try:
+                return f(*args, **kwargs)
+            except from_exc:
+                raise to_exc
+
+        return inner_translate_exc2
+
+    return inner_translate_exc1
+
+
+@translate_exc(from_exc=OSError, to_exc=NotImplementedError)
+def is_leader():
+    """Does the current unit hold the juju leadership
+
+    Uses juju to determine whether the current unit is the leader of its peers
+    """
+    cmd = ['is-leader', '--format=json']
+    return json.loads(subprocess.check_output(cmd).decode('UTF-8'))
+
+
+@translate_exc(from_exc=OSError, to_exc=NotImplementedError)
+def leader_get(attribute=None):
+    """Juju leader get value(s)"""
+    cmd = ['leader-get', '--format=json'] + [attribute or '-']
+    return json.loads(subprocess.check_output(cmd).decode('UTF-8'))
+
+
+@translate_exc(from_exc=OSError, to_exc=NotImplementedError)
+def leader_set(settings=None, **kwargs):
+    """Juju leader set value(s)"""
+    log("Juju leader-set '%s'" % (settings), level=DEBUG)
+    cmd = ['leader-set']
+    settings = settings or {}
+    settings.update(kwargs)
+    for k, v in settings.iteritems():
+        if v is None:
+            cmd.append('{}='.format(k))
+        else:
+            cmd.append('{}={}'.format(k, v))
+    subprocess.check_call(cmd)
 
=== modified file 'hooks/charmhelpers/core/host.py'
--- hooks/charmhelpers/core/host.py	2015-03-20 17:15:02 +0000
+++ hooks/charmhelpers/core/host.py	2015-06-04 23:12:46 +0000
@@ -90,7 +90,7 @@
             ['service', service_name, 'status'],
             stderr=subprocess.STDOUT).decode('UTF-8')
     except subprocess.CalledProcessError as e:
-        return 'unrecognized service' not in e.output
+        return b'unrecognized service' not in e.output
     else:
         return True
 
 
=== modified file 'hooks/charmhelpers/core/services/base.py'
--- hooks/charmhelpers/core/services/base.py	2015-03-20 17:15:02 +0000
+++ hooks/charmhelpers/core/services/base.py	2015-06-04 23:12:46 +0000
@@ -15,9 +15,9 @@
 # along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import re
 import json
-from collections import Iterable
+from inspect import getargspec
+from collections import Iterable, OrderedDict
 
 from charmhelpers.core import host
 from charmhelpers.core import hookenv
@@ -119,7 +119,7 @@
         """
         self._ready_file = os.path.join(hookenv.charm_dir(), 'READY-SERVICES.json')
         self._ready = None
-        self.services = {}
+        self.services = OrderedDict()
         for service in services or []:
             service_name = service['service']
             self.services[service_name] = service
@@ -132,8 +132,8 @@
         if hook_name == 'stop':
             self.stop_services()
         else:
+            self.reconfigure_services()
             self.provide_data()
-            self.reconfigure_services()
         cfg = hookenv.config()
         if cfg.implicit_save:
             cfg.save()
@@ -145,15 +145,36 @@
         A provider must have a `name` attribute, which indicates which relation
         to set data on, and a `provide_data()` method, which returns a dict of
         data to set.
+
+        The `provide_data()` method can optionally accept two parameters:
+
+          * ``remote_service`` The name of the remote service that the data will
+            be provided to.  The `provide_data()` method will be called once
+            for each connected service (not unit).  This allows the method to
+            tailor its data to the given service.
+          * ``service_ready`` Whether or not the service definition had all of
+            its requirements met, and thus the ``data_ready`` callbacks run.
+
+        Note that the ``provided_data`` methods are now called **after** the
+        ``data_ready`` callbacks are run.  This gives the ``data_ready`` callbacks
+        a chance to generate any data necessary for the providing to the remote
+        services.
         """
-        hook_name = hookenv.hook_name()
-        for service in self.services.values():
+        for service_name, service in self.services.items():
+            service_ready = self.is_ready(service_name)
             for provider in service.get('provided_data', []):
-                if re.match(r'{}-relation-(joined|changed)'.format(provider.name), hook_name):
-                    data = provider.provide_data()
-                    _ready = provider._is_ready(data) if hasattr(provider, '_is_ready') else data
-                    if _ready:
-                        hookenv.relation_set(None, data)
+                for relid in hookenv.relation_ids(provider.name):
+                    units = hookenv.related_units(relid)
+                    if not units:
+                        continue
+                    remote_service = units[0].split('/')[0]
+                    argspec = getargspec(provider.provide_data)
+                    if len(argspec.args) > 1:
+                        data = provider.provide_data(remote_service, service_ready)
+                    else:
+                        data = provider.provide_data()
+                    if data:
+                        hookenv.relation_set(relid, data)
 
     def reconfigure_services(self, *service_names):
         """
 
=== modified file 'hooks/charmhelpers/fetch/__init__.py'
--- hooks/charmhelpers/fetch/__init__.py	2015-05-01 14:56:06 +0000
+++ hooks/charmhelpers/fetch/__init__.py	2015-06-04 23:12:46 +0000
@@ -158,7 +158,7 @@
 
 def apt_cache(in_memory=True):
     """Build and return an apt cache"""
-    import apt_pkg
+    from apt import apt_pkg
     apt_pkg.init()
     if in_memory:
         apt_pkg.config.set("Dir::Cache::pkgcache", "")
 
=== modified file 'unit_tests/test_glance_relations.py'
--- unit_tests/test_glance_relations.py	2015-05-12 19:46:43 +0000
+++ unit_tests/test_glance_relations.py	2015-06-04 23:12:46 +0000
@@ -24,7 +24,6 @@
 TO_PATCH = [
     # charmhelpers.core.hookenv
     'Hooks',
-    'canonical_url',
     'config',
     'juju_log',
     'is_relation_made',
@@ -320,8 +319,9 @@
         )
         self.migrate_database.assert_called_with()
 
-    def test_image_service_joined_leader(self):
-        self.canonical_url.return_value = 'http://glancehost'
+    @patch.object(relations, 'canonical_url')
+    def test_image_service_joined_leader(self, _canonical_url):
+        _canonical_url.return_value = 'http://glancehost'
         relations.image_service_joined()
         args = {
             'glance-api-server': 'http://glancehost:9292',
@@ -329,8 +329,9 @@
         }
         self.relation_set.assert_called_with(**args)
 
-    def test_image_service_joined_specified_interface(self):
-        self.canonical_url.return_value = 'http://glancehost'
+    @patch.object(relations, 'canonical_url')
+    def test_image_service_joined_specified_interface(self, _canonical_url):
+        _canonical_url.return_value = 'http://glancehost'
         relations.image_service_joined(relation_id='image-service:1')
         args = {
             'glance-api-server': 'http://glancehost:9292',
@@ -417,10 +418,12 @@
         for c in [call('/etc/glance/glance.conf')]:
             self.assertNotIn(c, configs.write.call_args_list)
 
+    @patch("charmhelpers.core.host.service")
     @patch("glance_relations.relation_get", autospec=True)
     @patch.object(relations, 'CONFIGS')
     def test_ceph_changed_with_key_and_relation_data(self, configs,
-                                                     mock_relation_get):
+                                                     mock_relation_get,
+                                                     mock_service):
         configs.complete_contexts = MagicMock()
         configs.complete_contexts.return_value = ['ceph']
         configs.write = MagicMock()
@@ -439,8 +442,9 @@
         self.delete_keyring.assert_called_with(service='glance')
         self.assertTrue(configs.write_all.called)
 
-    def test_keystone_joined(self):
-        self.canonical_url.return_value = 'http://glancehost'
+    @patch.object(relations, 'canonical_url')
+    def test_keystone_joined(self, _canonical_url):
+        _canonical_url.return_value = 'http://glancehost'
         relations.keystone_joined()
         ex = {
             'region': 'RegionOne',
@@ -452,8 +456,9 @@
         }
         self.relation_set.assert_called_with(**ex)
 
-    def test_keystone_joined_with_relation_id(self):
-        self.canonical_url.return_value = 'http://glancehost'
+    @patch.object(relations, 'canonical_url')
+    def test_keystone_joined_with_relation_id(self, _canonical_url):
+        _canonical_url.return_value = 'http://glancehost'
         relations.keystone_joined(relation_id='identity-service:0')
         ex = {
             'region': 'RegionOne',
@@ -465,6 +470,26 @@
         }
         self.relation_set.assert_called_with(**ex)
 
+    @patch('charmhelpers.contrib.openstack.ip.is_clustered')
+    @patch('charmhelpers.contrib.openstack.ip.unit_get')
+    @patch('charmhelpers.contrib.openstack.ip.config')
+    def test_keystone_joined_public_endpoint(self, _config, _unit_get,
+                                             _is_clustered):
+        _unit_get.return_value = 'glancehost'
+        _is_clustered.return_value = False
+        self.test_config.set('os-public-hostname', 'glance.example.com')
+        _config.side_effect = self.test_config.get
+        relations.keystone_joined()
+        ex = {
+            'region': 'RegionOne',
+            'public_url': 'http://glance.example.com:9292',
+            'admin_url': 'http://glancehost:9292',
+            'service': 'glance',
+            'internal_url': 'http://glancehost:9292',
+            'relation_id': None,
+        }
+        self.relation_set.assert_called_with(**ex)
+
     @patch.object(relations, 'CONFIGS')
     def test_keystone_changes_incomplete(self, configs):
         configs.complete_contexts.return_value = []
@@ -570,9 +595,11 @@
                            call('/etc/haproxy/haproxy.cfg')],
                           configs.write.call_args_list)
 
+    @patch.object(relations, 'canonical_url')
     @patch.object(relations, 'relation_set')
     @patch.object(relations, 'CONFIGS')
-    def test_cluster_changed_with_ipv6(self, configs, relation_set):
+    def test_cluster_changed_with_ipv6(self, configs, relation_set,
+                                       _canonical_url):
         self.test_config.set('prefer-ipv6', True)
         configs.complete_contexts = MagicMock()
         configs.complete_contexts.return_value = ['cluster']
@@ -683,10 +710,11 @@
             'ha_changed: hacluster subordinate is not fully clustered.'
         )
 
+    @patch.object(relations, 'canonical_url')
     @patch.object(relations, 'keystone_joined')
     @patch.object(relations, 'CONFIGS')
     def test_configure_https_enable_with_identity_service(
-            self, configs, keystone_joined):
+            self, configs, keystone_joined, _canonical_url):
         configs.complete_contexts = MagicMock()
         configs.complete_contexts.return_value = ['https']
         configs.write = MagicMock()
@@ -697,10 +725,11 @@
         self.check_call.assert_called_has_calls(calls)
         keystone_joined.assert_called_with(relation_id='identity-service:0')
 
+    @patch.object(relations, 'canonical_url')
     @patch.object(relations, 'keystone_joined')
     @patch.object(relations, 'CONFIGS')
     def test_configure_https_disable_with_keystone_joined(
-            self, configs, keystone_joined):
+            self, configs, keystone_joined, _canonical_url):
         configs.complete_contexts = MagicMock()
         configs.complete_contexts.return_value = ['']
         configs.write = MagicMock()
@@ -711,10 +740,11 @@
         self.check_call.assert_called_has_calls(calls)
         keystone_joined.assert_called_with(relation_id='identity-service:0')
 
+    @patch.object(relations, 'canonical_url')
     @patch.object(relations, 'image_service_joined')
     @patch.object(relations, 'CONFIGS')
     def test_configure_https_enable_with_image_service(
-            self, configs, image_service_joined):
+            self, configs, image_service_joined, _canonical_url):
         configs.complete_contexts = MagicMock()
         configs.complete_contexts.return_value = ['https']
         configs.write = MagicMock()
@@ -725,10 +755,11 @@
         self.check_call.assert_called_has_calls(calls)
         image_service_joined.assert_called_with(relation_id='image-service:0')
 
+    @patch.object(relations, 'canonical_url')
     @patch.object(relations, 'image_service_joined')
     @patch.object(relations, 'CONFIGS')
     def test_configure_https_disable_with_image_service(
-            self, configs, image_service_joined):
+            self, configs, image_service_joined, _canonical_url):
         configs.complete_contexts = MagicMock()
         configs.complete_contexts.return_value = ['']
         configs.write = MagicMock()