Merge lp:~james-page/charms/trusty/glance/network-splits-https into lp:~openstack-charmers-archive/charms/trusty/glance/next

[James Page]

Add support for HTTPS+HA with multiple network endpoints.

[lp:~james-page/charms/trusty/glance/network-splits-https]

75. By James Page on 2014-10-02

Resync

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'hooks/charmhelpers/contrib/network/ip.py'
--- hooks/charmhelpers/contrib/network/ip.py	2014-09-30 12:52:17 +0000
+++ hooks/charmhelpers/contrib/network/ip.py	2014-10-02 19:25:42 +0000
@@ -57,6 +57,8 @@
         else:
             if fatal:
                 not_found_error_out()
+            else:
+                return None
 
     _validate_cidr(network)
     network = netaddr.IPNetwork(network)

=== modified file 'hooks/charmhelpers/contrib/openstack/amulet/deployment.py'
--- hooks/charmhelpers/contrib/openstack/amulet/deployment.py	2014-09-26 12:41:07 +0000
+++ hooks/charmhelpers/contrib/openstack/amulet/deployment.py	2014-10-02 19:25:42 +0000
@@ -1,6 +1,3 @@
-from bzrlib.branch import Branch
-import os
-import re
 from charmhelpers.contrib.amulet.deployment import (
     AmuletDeployment
 )
@@ -13,62 +10,62 @@
        that is specifically for use by OpenStack charms.
        """
 
-    def __init__(self, series=None, openstack=None, source=None):
+    def __init__(self, series=None, openstack=None, source=None, stable=True):
         """Initialize the deployment environment."""
         super(OpenStackAmuletDeployment, self).__init__(series)
         self.openstack = openstack
         self.source = source
-
-    def _is_dev_branch(self):
-        """Determine if branch being tested is a dev (i.e. next) branch."""
-        branch = Branch.open(os.getcwd())
-        parent = branch.get_parent()
-        pattern = re.compile("^.*/next/$")
-        if (pattern.match(parent)):
-            return True
-        else:
-            return False
+        self.stable = stable
+        # Note(coreycb): this needs to be changed when new next branches come
+        # out.
+        self.current_next = "trusty"
 
     def _determine_branch_locations(self, other_services):
         """Determine the branch locations for the other services.
 
-           If the branch being tested is a dev branch, then determine the
-           development branch locations for the other services. Otherwise,
-           the default charm store branches will be used."""
-        name = 0
-        if self._is_dev_branch():
-            updated_services = []
-            for svc in other_services:
-                if svc[name] in ['mysql', 'mongodb', 'rabbitmq-server']:
-                    location = 'lp:charms/{}'.format(svc[name])
+           Determine if the local branch being tested is derived from its
+           stable or next (dev) branch, and based on this, use the corresonding
+           stable or next branches for the other_services."""
+        base_charms = ['mysql', 'mongodb', 'rabbitmq-server']
+
+        if self.stable:
+            for svc in other_services:
+                temp = 'lp:charms/{}'
+                svc['location'] = temp.format(svc['name'])
+        else:
+            for svc in other_services:
+                if svc['name'] in base_charms:
+                    temp = 'lp:charms/{}'
+                    svc['location'] = temp.format(svc['name'])
                 else:
-                    temp = 'lp:~openstack-charmers/charms/trusty/{}/next'
-                    location = temp.format(svc[name])
-                updated_services.append(svc + (location,))
-            other_services = updated_services
+                    temp = 'lp:~openstack-charmers/charms/{}/{}/next'
+                    svc['location'] = temp.format(self.current_next,
+                                                  svc['name'])
         return other_services
 
     def _add_services(self, this_service, other_services):
         """Add services to the deployment and set openstack-origin/source."""
-        name = 0
         other_services = self._determine_branch_locations(other_services)
+
         super(OpenStackAmuletDeployment, self)._add_services(this_service,
                                                              other_services)
+
         services = other_services
         services.append(this_service)
-        use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph']
+        use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph',
+                      'ceph-osd', 'ceph-radosgw']
 
         if self.openstack:
             for svc in services:
-                if svc[name] not in use_source:
+                if svc['name'] not in use_source:
                     config = {'openstack-origin': self.openstack}
-                    self.d.configure(svc[name], config)
+                    self.d.configure(svc['name'], config)
 
         if self.source:
             for svc in services:
-                if svc[name] in use_source:
+                if svc['name'] in use_source:
                     config = {'source': self.source}
-                    self.d.configure(svc[name], config)
+                    self.d.configure(svc['name'], config)
 
     def _configure_services(self, configs):
         """Configure all of the services."""

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2014-09-26 14:49:38 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2014-10-02 19:25:42 +0000
@@ -52,6 +52,7 @@
 from charmhelpers.contrib.network.ip import (
     get_address_in_network,
     get_ipv6_addr,
+    get_netmask_for_address,
     format_ipv6_addr,
     is_address_in_network
 )
@@ -408,6 +409,9 @@
         return ctxt
 
 
+ADDRESS_TYPES = ['admin', 'internal', 'public']
+
+
 class HAProxyContext(OSContextGenerator):
     interfaces = ['cluster']
 
@@ -420,7 +424,6 @@
         if not relation_ids('cluster'):
             return {}
 
-        cluster_hosts = {}
         l_unit = local_unit().replace('/', '-')
 
         if config('prefer-ipv6'):
@@ -428,17 +431,49 @@
         else:
             addr = unit_get('private-address')
 
-        cluster_hosts[l_unit] = get_address_in_network(config('os-internal-network'),
-                                                       addr)
-
-        for rid in relation_ids('cluster'):
-            for unit in related_units(rid):
-                _unit = unit.replace('/', '-')
-                addr = relation_get('private-address', rid=rid, unit=unit)
-                cluster_hosts[_unit] = addr
+        cluster_hosts = {}
+
+        # NOTE(jamespage): build out map of configured network endpoints
+        # and associated backends
+        for addr_type in ADDRESS_TYPES:
+            laddr = get_address_in_network(
+                config('os-{}-network'.format(addr_type)))
+            if laddr:
+                cluster_hosts[laddr] = {}
+                cluster_hosts[laddr]['network'] = "{}/{}".format(
+                    laddr,
+                    get_netmask_for_address(laddr)
+                )
+                cluster_hosts[laddr]['backends'] = {}
+                cluster_hosts[laddr]['backends'][l_unit] = laddr
+                for rid in relation_ids('cluster'):
+                    for unit in related_units(rid):
+                        _unit = unit.replace('/', '-')
+                        _laddr = relation_get('{}-address'.format(addr_type),
+                                              rid=rid, unit=unit)
+                        if _laddr:
+                            cluster_hosts[laddr]['backends'][_unit] = _laddr
+
+        # NOTE(jamespage) no split configurations found, just use
+        # private addresses
+        if not cluster_hosts:
+            cluster_hosts[addr] = {}
+            cluster_hosts[addr]['network'] = "{}/{}".format(
+                addr,
+                get_netmask_for_address(addr)
+            )
+            cluster_hosts[addr]['backends'] = {}
+            cluster_hosts[addr]['backends'][l_unit] = addr
+            for rid in relation_ids('cluster'):
+                for unit in related_units(rid):
+                    _unit = unit.replace('/', '-')
+                    _laddr = relation_get('private-address',
+                                          rid=rid, unit=unit)
+                    if _laddr:
+                        cluster_hosts[addr]['backends'][_unit] = _laddr
 
         ctxt = {
-            'units': cluster_hosts,
+            'frontends': cluster_hosts,
         }
 
         if config('haproxy-server-timeout'):
@@ -455,12 +490,13 @@
             ctxt['haproxy_host'] = '0.0.0.0'
             ctxt['stat_port'] = ':8888'
 
-        if len(cluster_hosts.keys()) > 1:
-            # Enable haproxy when we have enough peers.
-            log('Ensuring haproxy enabled in /etc/default/haproxy.')
-            with open('/etc/default/haproxy', 'w') as out:
-                out.write('ENABLED=1\n')
-            return ctxt
+        for frontend in cluster_hosts:
+            if len(cluster_hosts[frontend]['backends']) > 1:
+                # Enable haproxy when we have enough peers.
+                log('Ensuring haproxy enabled in /etc/default/haproxy.')
+                with open('/etc/default/haproxy', 'w') as out:
+                    out.write('ENABLED=1\n')
+                return ctxt
         log('HAProxy context is incomplete, this unit has no peers.')
         return {}
 
@@ -722,22 +758,22 @@
 
 class OSConfigFlagContext(OSContextGenerator):
 
-        """
-        Responsible for adding user-defined config-flags in charm config to a
-        template context.
-
-        NOTE: the value of config-flags may be a comma-separated list of
-              key=value pairs and some Openstack config files support
-              comma-separated lists as values.
-        """
-
-        def __call__(self):
-            config_flags = config('config-flags')
-            if not config_flags:
-                return {}
-
-            flags = config_flags_parser(config_flags)
-            return {'user_config_flags': flags}
+    """
+    Responsible for adding user-defined config-flags in charm config to a
+    template context.
+
+    NOTE: the value of config-flags may be a comma-separated list of
+          key=value pairs and some Openstack config files support
+          comma-separated lists as values.
+    """
+
+    def __call__(self):
+        config_flags = config('config-flags')
+        if not config_flags:
+            return {}
+
+        flags = config_flags_parser(config_flags)
+        return {'user_config_flags': flags}
 
 
 class SubordinateConfigContext(OSContextGenerator):

=== modified file 'hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg'
--- hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg	2014-09-26 14:49:38 +0000
+++ hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg	2014-10-02 19:25:42 +0000
@@ -34,17 +34,21 @@
     stats uri /
     stats auth admin:password
 
-{% if units -%}
+{% if frontends -%}
 {% for service, ports in service_ports.iteritems() -%}
-listen {{ service }}_ipv4 0.0.0.0:{{ ports[0] }}
-    balance roundrobin
-    {% for unit, address in units.iteritems() -%}
-    server {{ unit }} {{ address }}:{{ ports[1] }} check
-    {% endfor %}
-listen {{ service }}_ipv6 :::{{ ports[0] }}
-    balance roundrobin
-    {% for unit, address in units.iteritems() -%}
-    server {{ unit }} {{ address }}:{{ ports[1] }} check
-    {% endfor %}
+frontend tcp-in_{{ service }}
+    bind *:{{ ports[0] }}
+    bind :::{{ ports[0] }}
+    {% for frontend in frontends -%}
+    acl net_{{ frontend }} dst {{ frontends[frontend]['network'] }}
+    use_backend {{ service }}_{{ frontend }} if net_{{ frontend }}
+    {% endfor %}
+{% for frontend in frontends -%}
+backend {{ service }}_{{ frontend }}
+    balance leastconn
+    {% for unit, address in frontends[frontend]['backends'].iteritems() -%}
+    server {{ unit }} {{ address }}:{{ ports[1] }} check
+    {% endfor %}
+{% endfor -%}
 {% endfor -%}
 {% endif -%}

=== modified file 'hooks/glance_relations.py'
--- hooks/glance_relations.py	2014-09-30 05:56:22 +0000
+++ hooks/glance_relations.py	2014-10-02 19:25:42 +0000
@@ -71,6 +71,8 @@
     PUBLIC, INTERNAL, ADMIN
 )
 
+from charmhelpers.contrib.openstack.context import ADDRESS_TYPES
+
 from subprocess import (
     check_call,
     call, )
@@ -188,9 +190,6 @@
 
 @hooks.hook('image-service-relation-joined')
 def image_service_joined(relation_id=None):
-    if not eligible_leader(CLUSTER_RES):
-        return
-
     relation_data = {
         'glance-api-server':
         "{}:9292".format(canonical_url(CONFIGS, INTERNAL))
@@ -248,10 +247,6 @@
 
 @hooks.hook('identity-service-relation-joined')
 def keystone_joined(relation_id=None):
-    if not eligible_leader(CLUSTER_RES):
-        juju_log('Deferring keystone_joined() to service leader.')
-        return
-
     public_url = '{}:9292'.format(canonical_url(CONFIGS, PUBLIC))
     internal_url = '{}:9292'.format(canonical_url(CONFIGS, INTERNAL))
     admin_url = '{}:9292'.format(canonical_url(CONFIGS, ADMIN))
@@ -311,15 +306,19 @@
 
 @hooks.hook('cluster-relation-joined')
 def cluster_joined(relation_id=None):
+    for addr_type in ADDRESS_TYPES:
+        address = get_address_in_network(
+            config('os-{}-network'.format(addr_type))
+        )
+        if address:
+            relation_set(
+                relation_id=relation_id,
+                relation_settings={'{}-address'.format(addr_type): address}
+            )
     if config('prefer-ipv6'):
         private_addr = get_ipv6_addr(exc_list=[config('vip')])[0]
-    else:
-        private_addr = unit_get('private-address')
-
-    address = get_address_in_network(config('os-internal-network'),
-                                     private_addr)
-    relation_set(relation_id=relation_id,
-                 relation_settings={'private-address': address})
+        relation_set(relation_id=relation_id,
+                     relation_settings={'private-address': private_addr})
 
 
 @hooks.hook('cluster-relation-changed')
@@ -397,9 +396,6 @@
     if not clustered or clustered in [None, 'None', '']:
         juju_log('ha_changed: hacluster subordinate is not fully clustered.')
         return
-    if not eligible_leader(CLUSTER_RES):
-        juju_log('ha_changed: hacluster complete but we are not leader.')
-        return
 
     # reconfigure endpoint in keystone to point to clustered VIP.
     [keystone_joined(rid) for rid in relation_ids('identity-service')]

=== removed file 'templates/openstack_https_frontend'
--- templates/openstack_https_frontend	2013-07-05 17:35:48 +0000
+++ templates/openstack_https_frontend	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-{% if endpoints %}
-{% for ext, int in endpoints %}
-Listen {{ ext }}
-NameVirtualHost *:{{ ext }}
-<VirtualHost *:{{ ext }}>
-    ServerName {{ private_address }}
-    SSLEngine on
-    SSLCertificateFile /etc/apache2/ssl/{{ namespace }}/cert
-    SSLCertificateKeyFile /etc/apache2/ssl/{{ namespace }}/key
-    ProxyPass / http://localhost:{{ int }}/
-    ProxyPassReverse / http://localhost:{{ int }}/
-    ProxyPreserveHost on
-</VirtualHost>
-<Proxy *>
-    Order deny,allow
-    Allow from all
-</Proxy>
-<Location />
-    Order allow,deny
-    Allow from all
-</Location>
-{% endfor %}
-{% endif %}

=== removed symlink 'templates/openstack_https_frontend.conf'
=== target was u'openstack_https_frontend'
=== modified file 'tests/charmhelpers/contrib/amulet/deployment.py'
--- tests/charmhelpers/contrib/amulet/deployment.py	2014-09-26 12:41:07 +0000
+++ tests/charmhelpers/contrib/amulet/deployment.py	2014-10-02 19:25:42 +0000
@@ -25,25 +25,30 @@
 
            Add services to the deployment where this_service is the local charm
            that we're testing and other_services are the other services that
-           are being used in the amulet tests.
+           are being used in the local amulet tests.
            """
-        name, units, location = range(3)
-
-        if this_service[name] != os.path.basename(os.getcwd()):
-            s = this_service[name]
+        if this_service['name'] != os.path.basename(os.getcwd()):
+            s = this_service['name']
             msg = "The charm's root directory name needs to be {}".format(s)
             amulet.raise_status(amulet.FAIL, msg=msg)
 
-        self.d.add(this_service[name], units=this_service[units])
+        if 'units' not in this_service:
+            this_service['units'] = 1
+
+        self.d.add(this_service['name'], units=this_service['units'])
 
         for svc in other_services:
-            if len(svc) > 2:
-                branch_location = svc[location]
+            if 'location' in svc:
+                branch_location = svc['location']
             elif self.series:
-                branch_location = 'cs:{}/{}'.format(self.series, svc[name]),
+                branch_location = 'cs:{}/{}'.format(self.series, svc['name']),
             else:
                 branch_location = None
-            self.d.add(svc[name], charm=branch_location, units=svc[units])
+
+            if 'units' not in svc:
+                svc['units'] = 1
+
+            self.d.add(svc['name'], charm=branch_location, units=svc['units'])
 
     def _add_relations(self, relations):
         """Add all of the relations for the services."""

=== modified file 'tests/charmhelpers/contrib/openstack/amulet/deployment.py'
--- tests/charmhelpers/contrib/openstack/amulet/deployment.py	2014-09-26 12:41:07 +0000
+++ tests/charmhelpers/contrib/openstack/amulet/deployment.py	2014-10-02 19:25:42 +0000
@@ -1,6 +1,3 @@
-from bzrlib.branch import Branch
-import os
-import re
 from charmhelpers.contrib.amulet.deployment import (
     AmuletDeployment
 )
@@ -13,62 +10,62 @@
        that is specifically for use by OpenStack charms.
        """
 
-    def __init__(self, series=None, openstack=None, source=None):
+    def __init__(self, series=None, openstack=None, source=None, stable=True):
         """Initialize the deployment environment."""
         super(OpenStackAmuletDeployment, self).__init__(series)
         self.openstack = openstack
         self.source = source
-
-    def _is_dev_branch(self):
-        """Determine if branch being tested is a dev (i.e. next) branch."""
-        branch = Branch.open(os.getcwd())
-        parent = branch.get_parent()
-        pattern = re.compile("^.*/next/$")
-        if (pattern.match(parent)):
-            return True
-        else:
-            return False
+        self.stable = stable
+        # Note(coreycb): this needs to be changed when new next branches come
+        # out.
+        self.current_next = "trusty"
 
     def _determine_branch_locations(self, other_services):
         """Determine the branch locations for the other services.
 
-           If the branch being tested is a dev branch, then determine the
-           development branch locations for the other services. Otherwise,
-           the default charm store branches will be used."""
-        name = 0
-        if self._is_dev_branch():
-            updated_services = []
-            for svc in other_services:
-                if svc[name] in ['mysql', 'mongodb', 'rabbitmq-server']:
-                    location = 'lp:charms/{}'.format(svc[name])
+           Determine if the local branch being tested is derived from its
+           stable or next (dev) branch, and based on this, use the corresonding
+           stable or next branches for the other_services."""
+        base_charms = ['mysql', 'mongodb', 'rabbitmq-server']
+
+        if self.stable:
+            for svc in other_services:
+                temp = 'lp:charms/{}'
+                svc['location'] = temp.format(svc['name'])
+        else:
+            for svc in other_services:
+                if svc['name'] in base_charms:
+                    temp = 'lp:charms/{}'
+                    svc['location'] = temp.format(svc['name'])
                 else:
-                    temp = 'lp:~openstack-charmers/charms/trusty/{}/next'
-                    location = temp.format(svc[name])
-                updated_services.append(svc + (location,))
-            other_services = updated_services
+                    temp = 'lp:~openstack-charmers/charms/{}/{}/next'
+                    svc['location'] = temp.format(self.current_next,
+                                                  svc['name'])
         return other_services
 
     def _add_services(self, this_service, other_services):
         """Add services to the deployment and set openstack-origin/source."""
-        name = 0
         other_services = self._determine_branch_locations(other_services)
+
         super(OpenStackAmuletDeployment, self)._add_services(this_service,
                                                              other_services)
+
         services = other_services
         services.append(this_service)
-        use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph']
+        use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph',
+                      'ceph-osd', 'ceph-radosgw']
 
         if self.openstack:
             for svc in services:
-                if svc[name] not in use_source:
+                if svc['name'] not in use_source:
                     config = {'openstack-origin': self.openstack}
-                    self.d.configure(svc[name], config)
+                    self.d.configure(svc['name'], config)
 
         if self.source:
             for svc in services:
-                if svc[name] in use_source:
+                if svc['name'] in use_source:
                     config = {'source': self.source}
-                    self.d.configure(svc[name], config)
+                    self.d.configure(svc['name'], config)
 
     def _configure_services(self, configs):
         """Configure all of the services."""

=== modified file 'unit_tests/test_glance_contexts.py'
--- unit_tests/test_glance_contexts.py	2014-09-26 12:41:07 +0000
+++ unit_tests/test_glance_contexts.py	2014-10-02 19:25:42 +0000
@@ -1,5 +1,5 @@
 import glance_contexts as contexts
-from mock import patch
+from mock import patch, MagicMock
 
 from test_utils import (
     CharmTestCase
@@ -41,25 +41,18 @@
             {'rbd_pool': service,
              'rbd_user': service})
 
-    mod_ch_context = 'charmhelpers.contrib.openstack.context'
-
-    @patch('%s.ApacheSSLContext.canonical_names' % (mod_ch_context))
-    @patch('%s.ApacheSSLContext.configure_ca' % (mod_ch_context))
-    @patch('%s.config' % (mod_ch_context))
-    @patch('%s.is_clustered' % (mod_ch_context))
-    @patch('%s.determine_apache_port' % (mod_ch_context))
-    @patch('%s.determine_api_port' % (mod_ch_context))
-    @patch('%s.unit_get' % (mod_ch_context))
-    @patch('%s.https' % (mod_ch_context))
+    @patch('charmhelpers.contrib.openstack.context.config')
+    @patch('charmhelpers.contrib.openstack.context.is_clustered')
+    @patch('charmhelpers.contrib.openstack.context.determine_apache_port')
+    @patch('charmhelpers.contrib.openstack.context.determine_api_port')
+    @patch('charmhelpers.contrib.openstack.context.unit_get')
+    @patch('charmhelpers.contrib.openstack.context.https')
     def test_apache_ssl_context_service_enabled(self, mock_https,
                                                 mock_unit_get,
                                                 mock_determine_api_port,
                                                 mock_determine_apache_port,
                                                 mock_is_clustered,
-                                                mock_hookenv,
-                                                mock_configure_ca,
-                                                mock_cfg_canonical_names):
-        mock_cfg_canonical_names.return_value = ['name.a']
+                                                mock_config):
         mock_https.return_value = True
         mock_unit_get.return_value = '1.2.3.4'
         mock_determine_api_port.return_value = '12'
@@ -67,17 +60,16 @@
         mock_is_clustered.return_value = False
 
         ctxt = contexts.ApacheSSLContext()
-        with patch.object(ctxt, 'enable_modules') as mock_enable_modules:
-            with patch.object(ctxt, 'configure_cert') as mock_configure_cert:
-                self.assertEquals(ctxt(), {'endpoints': [('1.2.3.4',
-                                                          '1.2.3.4',
-                                                          34, 12)],
-                                           'ext_ports': [34],
-                                           'namespace': 'glance'})
-                self.assertTrue(mock_https.called)
-                mock_unit_get.assert_called_with('private-address')
-                self.assertTrue(mock_enable_modules.called)
-                self.assertTrue(mock_configure_cert.called)
+        ctxt.enable_modules = MagicMock()
+        ctxt.configure_cert = MagicMock()
+        ctxt.configure_ca = MagicMock()
+        ctxt.canonical_names = MagicMock()
+        self.assertEquals(ctxt(), {'endpoints': [('1.2.3.4', '1.2.3.4',
+                                                  34, 12)],
+                                   'ext_ports': [34],
+                                   'namespace': 'glance'})
+        self.assertTrue(mock_https.called)
+        mock_unit_get.assert_called_with('private-address')
 
     @patch('charmhelpers.contrib.openstack.context.config')
     @patch('glance_contexts.config')

=== modified file 'unit_tests/test_glance_relations.py'
--- unit_tests/test_glance_relations.py	2014-09-30 05:56:22 +0000
+++ unit_tests/test_glance_relations.py	2014-10-02 19:25:42 +0000
@@ -14,6 +14,8 @@
 
 import glance_relations as relations
 
+relations.hooks._config_save = False
+
 utils.register_configs = _reg
 utils.restart_map = _map
 
@@ -265,13 +267,7 @@
         )
         self.migrate_database.assert_called_with()
 
-    def test_image_service_joined_not_leader(self):
-        self.eligible_leader.return_value = False
-        relations.image_service_joined()
-        self.assertFalse(self.relation_set.called)
-
     def test_image_service_joined_leader(self):
-        self.eligible_leader.return_value = True
         self.canonical_url.return_value = 'http://glancehost'
         relations.image_service_joined()
         args = {
@@ -281,7 +277,6 @@
         self.relation_set.assert_called_with(**args)
 
     def test_image_service_joined_specified_interface(self):
-        self.eligible_leader.return_value = True
         self.canonical_url.return_value = 'http://glancehost'
         relations.image_service_joined(relation_id='image-service:1')
         args = {
@@ -361,14 +356,7 @@
         self.ensure_ceph_pool.assert_called_with(service=self.service_name(),
                                                  replicas=2)
 
-    def test_keystone_joined_not_leader(self):
-        self.ceph_config_file.return_value = '/var/lib/charm/glance/ceph.conf'
-        self.eligible_leader.return_value = False
-        relations.keystone_joined()
-        self.assertFalse(self.relation_set.called)
-
     def test_keystone_joined(self):
-        self.eligible_leader.return_value = True
         self.canonical_url.return_value = 'http://glancehost'
         relations.keystone_joined()
         ex = {
@@ -382,7 +370,6 @@
         self.relation_set.assert_called_with(**ex)
 
     def test_keystone_joined_with_relation_id(self):
-        self.eligible_leader.return_value = True
         self.canonical_url.return_value = 'http://glancehost'
         relations.keystone_joined(relation_id='identity-service:0')
         ex = {
@@ -617,19 +604,10 @@
                           configs.write.call_args_list)
         self.assertFalse(self.juju_log.called)
 
-    @patch.object(relations, 'keystone_joined')
-    def test_ha_relation_changed_not_leader(self, joined):
-        self.relation_get.return_value = True
-        self.eligible_leader.return_value = False
-        relations.ha_relation_changed()
-        self.assertTrue(self.juju_log.called)
-        self.assertFalse(joined.called)
-
     @patch.object(relations, 'image_service_joined')
     @patch.object(relations, 'keystone_joined')
-    def test_ha_relation_changed_leader(self, ks_joined, image_joined):
+    def test_ha_relation_changed(self, ks_joined, image_joined):
         self.relation_get.return_value = True
-        self.eligible_leader.return_value = True
         self.relation_ids.side_effect = [['identity:0'], ['image:1']]
         relations.ha_relation_changed()
         ks_joined.assert_called_with('identity:0')