Merge lp:~gnuoy/charms/trusty/ceph-radosgw/workloadstatus into lp:~openstack-charmers-archive/charms/trusty/ceph-radosgw/next

[Liam Young]

[lp:~gnuoy/charms/trusty/ceph-radosgw/workloadstatus]

50. By Liam Young on 2015-10-08

Tidyup

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

charm_unit_test #10702 ceph-radosgw-next for gnuoy mp273834
    UNIT OK: passed

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

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

charm_lint_check #11511 ceph-radosgw-next for gnuoy mp273834
    LINT OK: passed

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

[Liam Young (gnuoy)]

This patch is a little larger than the other workload status ones because I've taken the opportunity to move the rendering of the ceph.conf over to us the templating and context helpers from charm helpers to bring it more inline with other openstack charms.

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

charm_amulet_test #7214 ceph-radosgw-next for gnuoy mp273834
    AMULET OK: passed

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

[David Ames (thedac)]

This is looking good. And it was useful for me to see the addition of a context object.

I have a couple of questions in line for the benefit of my own understanding.

review: Needs Information

[lp:~gnuoy/charms/trusty/ceph-radosgw/workloadstatus]

51. By Liam Young on 2015-10-12

Identity relation should be an optional interface for status checks as not all versions support it. Catch inconsistent auth passed back by mons

52. By Liam Young on 2015-10-12

Fix lint and add unit test to test inconsistent auths

[Liam Young (gnuoy)]

Manually ran amulet:

juju-test INFO : Results: 6 passed, 0 failed, 0 errored

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

charm_lint_check #11660 ceph-radosgw-next for gnuoy mp273834
    LINT OK: passed

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

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

charm_lint_check #11713 ceph-radosgw-next for gnuoy mp273834
    LINT OK: passed

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

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

charm_unit_test #10894 ceph-radosgw-next for gnuoy mp273834
    UNIT OK: passed

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

[David Ames (thedac)]

Looks great, merging.

review: Approve

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

charm_amulet_test #7278 ceph-radosgw-next for gnuoy mp273834
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12763689/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7278/

=== modified file 'hooks/ceph_radosgw_context.py'
--- hooks/ceph_radosgw_context.py	2015-01-14 16:48:07 +0000
+++ hooks/ceph_radosgw_context.py	2015-10-12 10:56:13 +0000
@@ -3,6 +3,18 @@
     determine_api_port,
     determine_apache_port,
 )
+from charmhelpers.core.host import cmp_pkgrevno
+from charmhelpers.core.hookenv import (
+    WARNING,
+    config,
+    log,
+    relation_ids,
+    related_units,
+    relation_get,
+    unit_get,
+)
+import socket
+import dns.resolver
 
 
 class HAProxyContext(context.HAProxyContext):
@@ -27,3 +39,83 @@
         # for haproxy.conf
         ctxt['service_ports'] = port_mapping
         return ctxt
+
+
+class IdentityServiceContext(context.IdentityServiceContext):
+    interfaces = ['identity-service']
+
+    def __call__(self):
+        ctxt = super(IdentityServiceContext, self).__call__()
+        if not ctxt:
+            return
+
+        ctxt['admin_token'] = None
+        for relid in relation_ids('identity-service'):
+            for unit in related_units(relid):
+                if not ctxt.get('admin_token'):
+                    ctxt['admin_token'] = \
+                        relation_get('admin_token', unit, relid)
+
+        ctxt['auth_type'] = 'keystone'
+        ctxt['user_roles'] = config('operator-roles')
+        ctxt['cache_size'] = config('cache-size')
+        ctxt['revocation_check_interval'] = config('revocation-check-interval')
+        if self.context_complete(ctxt):
+            return ctxt
+
+        return {}
+
+
+class MonContext(context.OSContextGenerator):
+    interfaces = ['ceph-radosgw']
+
+    def __call__(self):
+        if not relation_ids('mon'):
+            return {}
+        hosts = []
+        auths = []
+        for relid in relation_ids('mon'):
+            for unit in related_units(relid):
+                ceph_public_addr = relation_get('ceph-public-address', unit,
+                                                relid)
+                if ceph_public_addr:
+                    host_ip = self.get_host_ip(ceph_public_addr)
+                    hosts.append('{}:6789'.format(host_ip))
+                    _auth = relation_get('auth', unit, relid)
+                    if _auth:
+                        auths.append(_auth)
+        if len(set(auths)) != 1:
+            e = ("Inconsistent or absent auth returned by mon units. Setting "
+                 "auth_supported to 'none'")
+            log(e, level=WARNING)
+            auth = 'none'
+        else:
+            auth = auths[0]
+        hosts.sort()
+        ctxt = {
+            'auth_supported': auth,
+            'mon_hosts': ' '.join(hosts),
+            'hostname': socket.gethostname(),
+            'old_auth': cmp_pkgrevno('radosgw', "0.51") < 0,
+            'use_syslog': str(config('use-syslog')).lower(),
+            'embedded_webserver': config('use-embedded-webserver'),
+        }
+
+        if self.context_complete(ctxt):
+            return ctxt
+
+        return {}
+
+    def get_host_ip(self, hostname=None):
+        try:
+            if not hostname:
+                hostname = unit_get('private-address')
+            # Test to see if already an IPv4 address
+            socket.inet_aton(hostname)
+            return hostname
+        except socket.error:
+            # This may throw an NXDOMAIN exception; in which case
+            # things are badly broken so just let it kill the hook
+            answers = dns.resolver.query(hostname, 'A')
+            if answers:
+                return answers[0].address

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-09-22 13:36:25 +0000
+++ hooks/hooks.py	2015-10-12 10:56:13 +0000
@@ -16,13 +16,13 @@
 from charmhelpers.core.hookenv import (
     relation_get,
     relation_ids,
-    related_units,
     config,
     unit_get,
     open_port,
     relation_set,
     log, ERROR,
     Hooks, UnregisteredHookError,
+    status_set,
 )
 from charmhelpers.fetch import (
     apt_update,
@@ -32,20 +32,20 @@
 )
 from charmhelpers.core.host import (
     lsb_release,
-    restart_on_change
+    restart_on_change,
 )
 from utils import (
     render_template,
-    get_host_ip,
     enable_pocket,
     is_apache_24,
     CEPHRG_HA_RES,
     register_configs,
+    REQUIRED_INTERFACES,
+    check_optional_relations,
 )
 
 from charmhelpers.payload.execd import execd_preinstall
 from charmhelpers.core.host import cmp_pkgrevno
-from socket import gethostname as get_unit_hostname
 
 from charmhelpers.contrib.network.ip import (
     get_iface_for_address,
@@ -55,7 +55,9 @@
     canonical_url,
     PUBLIC, INTERNAL, ADMIN,
 )
-
+from charmhelpers.contrib.openstack.utils import (
+    set_os_workload_status,
+)
 hooks = Hooks()
 CONFIGS = register_configs()
 
@@ -96,6 +98,7 @@
 
 
 def install_packages():
+    status_set('maintenance', 'Installing apt packages')
     add_source(config('source'), config('key'))
     if (config('use-ceph-optimised-packages') and
             not config('use-embedded-webserver')):
@@ -111,37 +114,14 @@
 
 @hooks.hook('install.real')
 def install():
+    status_set('maintenance', 'Executing pre-install')
     execd_preinstall()
     enable_pocket('multiverse')
     install_packages()
     os.makedirs(NSS_DIR)
-
-
-def emit_cephconf():
-    # Ensure ceph directory actually exists
     if not os.path.exists('/etc/ceph'):
         os.makedirs('/etc/ceph')
 
-    cephcontext = {
-        'auth_supported': get_auth() or 'none',
-        'mon_hosts': ' '.join(get_mon_hosts()),
-        'hostname': get_unit_hostname(),
-        'old_auth': cmp_pkgrevno('radosgw', "0.51") < 0,
-        'use_syslog': str(config('use-syslog')).lower(),
-        'embedded_webserver': config('use-embedded-webserver'),
-    }
-
-    # Check to ensure that correct version of ceph is
-    # in use
-    if cmp_pkgrevno('radosgw', '0.55') >= 0:
-        # Add keystone configuration if found
-        ks_conf = get_keystone_conf()
-        if ks_conf:
-            cephcontext.update(ks_conf)
-
-    with open('/etc/ceph/ceph.conf', 'w') as cephconf:
-        cephconf.write(render_template('ceph.conf', cephcontext))
-
 
 def emit_apacheconf():
     apachecontext = {
@@ -181,9 +161,9 @@
                     '/etc/haproxy/haproxy.cfg': ['haproxy']})
 def config_changed():
     install_packages()
-    emit_cephconf()
     CONFIGS.write_all()
     if not config('use-embedded-webserver'):
+        status_set('maintenance', 'configuring apache')
         emit_apacheconf()
         install_www_scripts()
         apache_sites()
@@ -194,57 +174,11 @@
         identity_joined(relid=r_id)
 
 
-def get_mon_hosts():
-    hosts = []
-    for relid in relation_ids('mon'):
-        for unit in related_units(relid):
-            host_ip = get_host_ip(relation_get('ceph-public-address',
-                                               unit, relid))
-            hosts.append('{}:6789'.format(host_ip))
-
-    hosts.sort()
-    return hosts
-
-
-def get_auth():
-    return get_conf('auth')
-
-
-def get_conf(name):
-    for relid in relation_ids('mon'):
-        for unit in related_units(relid):
-            conf = relation_get(name,
-                                unit, relid)
-            if conf:
-                return conf
-    return None
-
-
-def get_keystone_conf():
-    for relid in relation_ids('identity-service'):
-        for unit in related_units(relid):
-            ks_auth = {
-                'auth_type': 'keystone',
-                'auth_protocol':
-                relation_get('auth_protocol', unit, relid) or "http",
-                'auth_host': relation_get('auth_host', unit, relid),
-                'auth_port': relation_get('auth_port', unit, relid),
-                'admin_token': relation_get('admin_token', unit, relid),
-                'user_roles': config('operator-roles'),
-                'cache_size': config('cache-size'),
-                'revocation_check_interval':
-                config('revocation-check-interval')
-            }
-            if None not in ks_auth.itervalues():
-                return ks_auth
-    return None
-
-
 @hooks.hook('mon-relation-departed',
             'mon-relation-changed')
 @restart_on_change({'/etc/ceph/ceph.conf': ['radosgw']})
 def mon_relation():
-    emit_cephconf()
+    CONFIGS.write_all()
     key = relation_get('radosgw_key')
     if key:
         ceph.import_radosgw_key(key)
@@ -295,7 +229,7 @@
 @hooks.hook('identity-service-relation-changed')
 @restart_on_change({'/etc/ceph/ceph.conf': ['radosgw']})
 def identity_changed():
-    emit_cephconf()
+    CONFIGS.write_all()
     restart()
 
 
@@ -377,3 +311,5 @@
         hooks.execute(sys.argv)
     except UnregisteredHookError as e:
         log('Unknown hook {} - skipping.'.format(e))
+    set_os_workload_status(CONFIGS, REQUIRED_INTERFACES,
+                           charm_func=check_optional_relations)

=== modified file 'hooks/install'
--- hooks/install	2015-09-22 13:36:25 +0000
+++ hooks/install	2015-10-12 10:56:13 +0000
@@ -2,7 +2,7 @@
 # Wrapper to deal with newer Ubuntu versions that don't have py2 installed
 # by default.
 
-declare -a DEPS=('apt' 'netaddr' 'netifaces' 'pip' 'yaml')
+declare -a DEPS=('apt' 'netaddr' 'netifaces' 'pip' 'yaml' 'jinja2' 'dnspython')
 
 check_and_install() {
     pkg="${1}-${2}"

=== modified file 'hooks/utils.py'
--- hooks/utils.py	2015-02-10 10:30:13 +0000
+++ hooks/utils.py	2015-10-12 10:56:13 +0000
@@ -1,4 +1,3 @@
-
 #
 # Copyright 2012 Canonical Ltd.
 #
@@ -10,18 +9,29 @@
 import socket
 import re
 import os
+import dns.resolver
+import jinja2
 from copy import deepcopy
 from collections import OrderedDict
-from charmhelpers.core.hookenv import unit_get
-from charmhelpers.fetch import apt_install
+from charmhelpers.core.hookenv import unit_get, relation_ids, status_get
 from charmhelpers.contrib.openstack import context, templating
+from charmhelpers.contrib.openstack.utils import set_os_workload_status
+from charmhelpers.contrib.hahelpers.cluster import get_hacluster_config
+from charmhelpers.core.host import cmp_pkgrevno
+from charmhelpers.fetch import filter_installed_packages
 
 import ceph_radosgw_context
 
+# The interface is said to be satisfied if anyone of the interfaces in the
+# list has a complete context.
+REQUIRED_INTERFACES = {
+    'mon': ['ceph-radosgw'],
+}
 CEPHRG_HA_RES = 'grp_cephrg_vips'
 TEMPLATES_DIR = 'templates'
 TEMPLATES = 'templates/'
 HAPROXY_CONF = '/etc/haproxy/haproxy.cfg'
+CEPH_CONF = '/etc/ceph/ceph.conf'
 
 BASE_RESOURCE_MAP = OrderedDict([
     (HAPROXY_CONF, {
@@ -29,20 +39,12 @@
                      ceph_radosgw_context.HAProxyContext()],
         'services': ['haproxy'],
     }),
+    (CEPH_CONF, {
+        'contexts': [ceph_radosgw_context.MonContext()],
+        'services': ['radosgw'],
+    }),
 ])
 
-try:
-    import jinja2
-except ImportError:
-    apt_install('python-jinja2', fatal=True)
-    import jinja2
-
-try:
-    import dns.resolver
-except ImportError:
-    apt_install('python-dnspython', fatal=True)
-    import dns.resolver
-
 
 def resource_map():
     '''
@@ -58,7 +60,14 @@
 def register_configs(release='icehouse'):
     configs = templating.OSConfigRenderer(templates_dir=TEMPLATES,
                                           openstack_release=release)
-    for cfg, rscs in resource_map().iteritems():
+    CONFIGS = resource_map()
+    pkg = 'radosgw'
+    if not filter_installed_packages([pkg]) and cmp_pkgrevno(pkg, '0.55') >= 0:
+        # Add keystone configuration if found
+        CONFIGS[CEPH_CONF]['contexts'].append(
+            ceph_radosgw_context.IdentityServiceContext()
+        )
+    for cfg, rscs in CONFIGS.iteritems():
         configs.register(cfg, rscs['contexts'])
     return configs
 
@@ -103,3 +112,23 @@
         return True
     else:
         return False
+
+
+def check_optional_relations(configs):
+    required_interfaces = {}
+    if relation_ids('ha'):
+        required_interfaces['ha'] = ['cluster']
+        try:
+            get_hacluster_config()
+        except:
+            return ('blocked',
+                    'hacluster missing configuration: '
+                    'vip, vip_iface, vip_cidr')
+    if cmp_pkgrevno('radosgw', '0.55') >= 0 and \
+            relation_ids('identity-service'):
+        required_interfaces['identity'] = ['identity-service']
+    if required_interfaces:
+        set_os_workload_status(configs, required_interfaces)
+        return status_get()
+    else:
+        return 'unknown', 'No optional relations'

=== added file 'unit_tests/test_ceph_radosgw_context.py'
--- unit_tests/test_ceph_radosgw_context.py	1970-01-01 00:00:00 +0000
+++ unit_tests/test_ceph_radosgw_context.py	2015-10-12 10:56:13 +0000
@@ -0,0 +1,202 @@
+from mock import patch
+
+import ceph_radosgw_context as context
+
+from test_utils import CharmTestCase
+import charmhelpers
+
+TO_PATCH = [
+    'config',
+    'log',
+    'relation_get',
+    'relation_ids',
+    'related_units',
+    'cmp_pkgrevno',
+    'socket',
+]
+
+
+class HAProxyContextTests(CharmTestCase):
+    def setUp(self):
+        super(HAProxyContextTests, self).setUp(context, TO_PATCH)
+        self.relation_get.side_effect = self.test_relation.get
+        self.config.side_effect = self.test_config.get
+
+    @patch('charmhelpers.contrib.openstack.context.unit_get')
+    @patch('charmhelpers.contrib.openstack.context.local_unit')
+    @patch('charmhelpers.contrib.openstack.context.get_host_ip')
+    @patch('charmhelpers.contrib.openstack.context.config')
+    @patch('charmhelpers.contrib.hahelpers.cluster.config_get')
+    @patch('charmhelpers.contrib.openstack.context.relation_ids')
+    @patch('charmhelpers.contrib.hahelpers.cluster.relation_ids')
+    def test_ctxt(self, _harelation_ids, _ctxtrelation_ids, _haconfig,
+                  _ctxtconfig, _get_host_ip, _local_unit, _unit_get):
+        _get_host_ip.return_value = '10.0.0.10'
+        _unit_get.return_value = '10.0.0.10'
+        _ctxtconfig.side_effect = self.test_config.get
+        _haconfig.side_effect = self.test_config.get
+        _harelation_ids.return_value = []
+        haproxy_context = context.HAProxyContext()
+        expect = {
+            'cephradosgw_bind_port': 70,
+            'service_ports': {'cephradosgw-server': [80, 70]}
+        }
+        self.assertEqual(expect, haproxy_context())
+
+
+class IdentityServiceContextTest(CharmTestCase):
+
+    def setUp(self):
+        super(IdentityServiceContextTest, self).setUp(context, TO_PATCH)
+        self.relation_get.side_effect = self.test_relation.get
+        self.config.side_effect = self.test_config.get
+
+    @patch.object(charmhelpers.contrib.openstack.context, 'format_ipv6_addr')
+    @patch.object(charmhelpers.contrib.openstack.context, 'context_complete')
+    @patch.object(charmhelpers.contrib.openstack.context, 'relation_get')
+    @patch.object(charmhelpers.contrib.openstack.context, 'related_units')
+    @patch.object(charmhelpers.contrib.openstack.context, 'relation_ids')
+    @patch.object(charmhelpers.contrib.openstack.context, 'log')
+    def test_ids_ctxt(self, _log, _rids, _runits, _rget, _ctxt_comp,
+                      _format_ipv6_addr):
+        self.test_config.set('operator-roles', 'Babel')
+        self.test_config.set('cache-size', '42')
+        self.test_config.set('revocation-check-interval', '7500000')
+        self.test_relation.set({'admin_token': 'ubuntutesting'})
+        self.relation_ids.return_value = ['identity-service:5']
+        self.related_units.return_value = ['keystone/0']
+        _format_ipv6_addr.return_value = False
+        _rids.return_value = 'rid1'
+        _runits.return_value = 'runit'
+        _ctxt_comp.return_value = True
+        id_data = {
+            'service_port': 9876,
+            'service_host': '127.0.0.4',
+            'service_tenant_id': '2852107b8f8f473aaf0d769c7bbcf86b',
+            'auth_host': '127.0.0.5',
+            'auth_port': 5432,
+            'service_tenant': 'ten',
+            'service_username': 'admin',
+            'service_password': 'adminpass',
+        }
+        _rget.return_value = id_data
+        ids_ctxt = context.IdentityServiceContext()
+        expect = {
+            'admin_password': 'adminpass',
+            'admin_tenant_id': '2852107b8f8f473aaf0d769c7bbcf86b',
+            'admin_tenant_name': 'ten',
+            'admin_token': 'ubuntutesting',
+            'admin_user': 'admin',
+            'auth_host': '127.0.0.5',
+            'auth_port': 5432,
+            'auth_protocol': 'http',
+            'auth_type': 'keystone',
+            'cache_size': '42',
+            'revocation_check_interval': '7500000',
+            'service_host': '127.0.0.4',
+            'service_port': 9876,
+            'service_protocol': 'http',
+            'user_roles': 'Babel',
+        }
+        self.assertEqual(expect, ids_ctxt())
+
+    @patch.object(charmhelpers.contrib.openstack.context, 'format_ipv6_addr')
+    @patch.object(charmhelpers.contrib.openstack.context, 'context_complete')
+    @patch.object(charmhelpers.contrib.openstack.context, 'relation_get')
+    @patch.object(charmhelpers.contrib.openstack.context, 'related_units')
+    @patch.object(charmhelpers.contrib.openstack.context, 'relation_ids')
+    @patch.object(charmhelpers.contrib.openstack.context, 'log')
+    def test_ids_ctxt_no_admin_token(self, _log, _rids, _runits, _rget,
+                                     _ctxt_comp, _format_ipv6_addr):
+        self.test_config.set('operator-roles', 'Babel')
+        self.test_config.set('cache-size', '42')
+        self.test_config.set('revocation-check-interval', '7500000')
+        self.test_relation.set({})
+        self.relation_ids.return_value = ['identity-service:5']
+        self.related_units.return_value = ['keystone/0']
+        _format_ipv6_addr.return_value = False
+        _rids.return_value = 'rid1'
+        _runits.return_value = 'runit'
+        _ctxt_comp.return_value = True
+        id_data = {
+            'service_port': 9876,
+            'service_host': '127.0.0.4',
+            'service_tenant_id': '2852107b8f8f473aaf0d769c7bbcf86b',
+            'auth_host': '127.0.0.5',
+            'auth_port': 5432,
+            'service_tenant': 'ten',
+            'service_username': 'admin',
+            'service_password': 'adminpass',
+        }
+        _rget.return_value = id_data
+        ids_ctxt = context.IdentityServiceContext()
+        self.assertEqual({}, ids_ctxt())
+
+    @patch.object(charmhelpers.contrib.openstack.context, 'relation_ids')
+    @patch.object(charmhelpers.contrib.openstack.context, 'log')
+    def test_ids_ctxt_no_rels(self, _log, _rids):
+        _rids.return_value = []
+        ids_ctxt = context.IdentityServiceContext()
+        self.assertEquals(ids_ctxt(), None)
+
+
+class MonContextTest(CharmTestCase):
+
+    def setUp(self):
+        super(MonContextTest, self).setUp(context, TO_PATCH)
+        self.config.side_effect = self.test_config.get
+
+    def test_ctxt(self):
+        self.socket.gethostname.return_value = '10.0.0.10'
+        mon_ctxt = context.MonContext()
+        addresses = ['10.5.4.1', '10.5.4.2', '10.5.4.3']
+
+        def _relation_get(attr, unit, rid):
+            if attr == 'ceph-public-address':
+                return addresses.pop()
+            elif attr == 'auth':
+                return 'cephx'
+        self.relation_get.side_effect = _relation_get
+        self.relation_ids.return_value = ['mon:6']
+        self.related_units.return_value = ['ceph/0', 'ceph/1', 'ceph/2']
+        expect = {
+            'auth_supported': 'cephx',
+            'embedded_webserver': False,
+            'hostname': '10.0.0.10',
+            'mon_hosts': '10.5.4.1:6789 10.5.4.2:6789 10.5.4.3:6789',
+            'old_auth': False,
+            'use_syslog': 'false'
+        }
+        self.assertEqual(expect, mon_ctxt())
+
+    def test_ctxt_missing_data(self):
+        self.socket.gethostname.return_value = '10.0.0.10'
+        mon_ctxt = context.MonContext()
+        self.relation_get.return_value = None
+        self.relation_ids.return_value = ['mon:6']
+        self.related_units.return_value = ['ceph/0', 'ceph/1', 'ceph/2']
+        self.assertEqual({}, mon_ctxt())
+
+    def test_ctxt_inconsistent_auths(self):
+        self.socket.gethostname.return_value = '10.0.0.10'
+        mon_ctxt = context.MonContext()
+        addresses = ['10.5.4.1', '10.5.4.2', '10.5.4.3']
+        auths = ['cephx', 'cephy', 'cephz']
+
+        def _relation_get(attr, unit, rid):
+            if attr == 'ceph-public-address':
+                return addresses.pop()
+            elif attr == 'auth':
+                return auths.pop()
+        self.relation_get.side_effect = _relation_get
+        self.relation_ids.return_value = ['mon:6']
+        self.related_units.return_value = ['ceph/0', 'ceph/1', 'ceph/2']
+        expect = {
+            'auth_supported': 'none',
+            'embedded_webserver': False,
+            'hostname': '10.0.0.10',
+            'mon_hosts': '10.5.4.1:6789 10.5.4.2:6789 10.5.4.3:6789',
+            'old_auth': False,
+            'use_syslog': 'false'
+        }
+        self.assertEqual(expect, mon_ctxt())

=== modified file 'unit_tests/test_hooks.py'
--- unit_tests/test_hooks.py	2015-06-04 23:06:40 +0000
+++ unit_tests/test_hooks.py	2015-10-12 10:56:13 +0000
@@ -23,6 +23,7 @@
         import hooks as ceph_hooks
 
 TO_PATCH = [
+    'CONFIGS',
     'add_source',
     'apt_update',
     'apt_install',
@@ -31,22 +32,20 @@
     'cmp_pkgrevno',
     'execd_preinstall',
     'enable_pocket',
-    'get_host_ip',
     'get_iface_for_address',
     'get_netmask_for_address',
-    'get_unit_hostname',
     'glob',
     'is_apache_24',
     'log',
     'lsb_release',
     'open_port',
     'os',
-    'related_units',
     'relation_ids',
     'relation_set',
     'relation_get',
     'render_template',
     'shutil',
+    'status_set',
     'subprocess',
     'sys',
     'unit_get',
@@ -123,31 +122,6 @@
         self.enable_pocket.assert_called_with('multiverse')
         self.os.makedirs.called_with('/var/lib/ceph/nss')
 
-    def test_emit_cephconf(self):
-        _get_keystone_conf = self.patch('get_keystone_conf')
-        _get_auth = self.patch('get_auth')
-        _get_mon_hosts = self.patch('get_mon_hosts')
-        _get_auth.return_value = 'cephx'
-        _get_keystone_conf.return_value = {'keystone_key': 'keystone_value'}
-        _get_mon_hosts.return_value = ['10.0.0.1:6789', '10.0.0.2:6789']
-        self.get_unit_hostname.return_value = 'bob'
-        self.os.path.exists.return_value = False
-        cephcontext = {
-            'auth_supported': 'cephx',
-            'mon_hosts': '10.0.0.1:6789 10.0.0.2:6789',
-            'hostname': 'bob',
-            'old_auth': False,
-            'use_syslog': 'false',
-            'keystone_key': 'keystone_value',
-            'embedded_webserver': False,
-        }
-        self.cmp_pkgrevno.return_value = 1
-        with patch_open() as (_open, _file):
-            ceph_hooks.emit_cephconf()
-            self.os.makedirs.assert_called_with('/etc/ceph')
-            _open.assert_called_with('/etc/ceph/ceph.conf', 'w')
-            self.render_template.assert_called_with('ceph.conf', cephcontext)
-
     def test_emit_apacheconf(self):
         self.is_apache_24.return_value = True
         self.unit_get.return_value = '10.0.0.1'
@@ -195,7 +169,6 @@
 
     def test_config_changed(self):
         _install_packages = self.patch('install_packages')
-        _emit_cephconf = self.patch('emit_cephconf')
         _emit_apacheconf = self.patch('emit_apacheconf')
         _install_www_scripts = self.patch('install_www_scripts')
         _apache_sites = self.patch('apache_sites')
@@ -203,105 +176,30 @@
         _apache_reload = self.patch('apache_reload')
         ceph_hooks.config_changed()
         _install_packages.assert_called()
-        _emit_cephconf.assert_called()
+        self.CONFIGS.write_all.assert_called_with()
         _emit_apacheconf.assert_called()
         _install_www_scripts.assert_called()
         _apache_sites.assert_called()
         _apache_modules.assert_called()
         _apache_reload.assert_called()
 
-    def test_get_mon_hosts(self):
-        self.relation_ids.return_value = ['monrelid']
-        self.related_units.return_value = ['monunit']
-
-        def rel_get(k, *args):
-            return {'private-address': '127.0.0.1',
-                    'ceph-public-address': '10.0.0.1'}[k]
-
-        self.relation_get.side_effect = rel_get
-        self.get_host_ip.side_effect = lambda x: x
-        self.assertEquals(ceph_hooks.get_mon_hosts(), ['10.0.0.1:6789'])
-
-    def test_get_conf(self):
-        self.relation_ids.return_value = ['monrelid']
-        self.related_units.return_value = ['monunit']
-        self.relation_get.return_value = 'bob'
-        self.assertEquals(ceph_hooks.get_conf('key'), 'bob')
-
-    def test_get_conf_nomatch(self):
-        self.relation_ids.return_value = ['monrelid']
-        self.related_units.return_value = ['monunit']
-        self.relation_get.return_value = ''
-        self.assertEquals(ceph_hooks.get_conf('key'), None)
-
-    def test_get_auth(self):
-        self.relation_ids.return_value = ['monrelid']
-        self.related_units.return_value = ['monunit']
-        self.relation_get.return_value = 'bob'
-        self.assertEquals(ceph_hooks.get_auth(), 'bob')
-
-    def test_get_keystone_conf(self):
-        self.test_config.set('operator-roles', 'admin')
-        self.test_config.set('cache-size', '42')
-        self.test_config.set('revocation-check-interval', '21')
-        self.relation_ids.return_value = ['idrelid']
-        self.related_units.return_value = ['idunit']
-
-        def _relation_get(key, unit, relid):
-            ks_dict = {
-                'auth_protocol': 'https',
-                'auth_host': '10.0.0.2',
-                'auth_port': '8090',
-                'admin_token': 'sectocken',
-            }
-            return ks_dict[key]
-        self.relation_get.side_effect = _relation_get
-        self.assertEquals(ceph_hooks.get_keystone_conf(), {
-            'auth_type': 'keystone',
-            'auth_protocol': 'https',
-            'admin_token': 'sectocken',
-            'user_roles': 'admin',
-            'auth_host': '10.0.0.2',
-            'cache_size': '42',
-            'auth_port': '8090',
-            'revocation_check_interval': '21'})
-
-    def test_get_keystone_conf_missinginfo(self):
-        self.test_config.set('operator-roles', 'admin')
-        self.test_config.set('cache-size', '42')
-        self.test_config.set('revocation-check-interval', '21')
-        self.relation_ids.return_value = ['idrelid']
-        self.related_units.return_value = ['idunit']
-
-        def _relation_get(key, unit, relid):
-            ks_dict = {
-                'auth_protocol': 'https',
-                'auth_host': '10.0.0.2',
-                'auth_port': '8090',
-            }
-            return ks_dict[key] if key in ks_dict else None
-        self.relation_get.side_effect = _relation_get
-        self.assertEquals(ceph_hooks.get_keystone_conf(), None)
-
     def test_mon_relation(self):
-        _emit_cephconf = self.patch('emit_cephconf')
         _ceph = self.patch('ceph')
         _restart = self.patch('restart')
         self.relation_get.return_value = 'seckey'
         ceph_hooks.mon_relation()
         _restart.assert_called()
         _ceph.import_radosgw_key.assert_called_with('seckey')
-        _emit_cephconf.assert_called()
+        self.CONFIGS.write_all.assert_called_with()
 
     def test_mon_relation_nokey(self):
-        _emit_cephconf = self.patch('emit_cephconf')
         _ceph = self.patch('ceph')
         _restart = self.patch('restart')
         self.relation_get.return_value = None
         ceph_hooks.mon_relation()
         self.assertFalse(_ceph.import_radosgw_key.called)
         self.assertFalse(_restart.called)
-        _emit_cephconf.assert_called()
+        self.CONFIGS.write_all.assert_called_with()
 
     def test_gateway_relation(self):
         self.unit_get.return_value = 'myserver'
@@ -374,10 +272,9 @@
             admin_url='http://myserv:80/swift')
 
     def test_identity_changed(self):
-        _emit_cephconf = self.patch('emit_cephconf')
         _restart = self.patch('restart')
         ceph_hooks.identity_changed()
-        _emit_cephconf.assert_called()
+        self.CONFIGS.write_all.assert_called_with()
         _restart.assert_called()
 
     @patch('charmhelpers.contrib.openstack.ip.is_clustered')
@@ -391,12 +288,11 @@
         self.assertEquals(ceph_hooks.canonical_url({}, PUBLIC),
                           'http://[%s]' % ipv6_addr)
 
-    @patch.object(ceph_hooks, 'CONFIGS')
-    def test_cluster_changed(self, configs):
+    def test_cluster_changed(self):
         _id_joined = self.patch('identity_joined')
         self.relation_ids.return_value = ['rid']
         ceph_hooks.cluster_changed()
-        configs.write_all.assert_called()
+        self.CONFIGS.write_all.assert_called_with()
         _id_joined.assert_called_with(relid='rid')
 
     def test_ha_relation_joined_no_vip(self):