remove upgrade_keys

This function is no longer necessary as we do
not need to ensure that the remote units can
create their own pools

Partial-Bug: 1424771
Change-Id: Id94c983b9631ac5a5c0a43813b2157724b148a87

hooks/ceph_hooks.py

@@ -332,19 +332,6 @@ def notify_client():
             mds_relation_joined(relid=relid, unit=unit)
 
 
-def upgrade_keys():
-    """ Ceph now required mon allow rw for pool creation """
-    if len(relation_ids('radosgw')) > 0:
-        ceph.upgrade_key_caps('client.radosgw.gateway',
-                              ceph._radosgw_caps)
-    for relid in relation_ids('client'):
-        units = related_units(relid)
-        if len(units) > 0:
-            service_name = units[0].split('/')[0]
-            ceph.upgrade_key_caps('client.{}'.format(service_name),
-                                  ceph._default_caps)
-
-
 @hooks.hook('osd-relation-joined')
 @hooks.hook('osd-relation-changed')
 def osd_relation(relid=None):
@@ -536,7 +523,6 @@ def upgrade_charm():
     emit_cephconf()
     apt_install(packages=filter_installed_packages(ceph.PACKAGES), fatal=True)
     ceph.update_monfs()
-    upgrade_keys()
     mon_relation_joined()
     if is_relation_made("nrpe-external-master"):
         update_nrpe_config()

unit_tests/test_ceph_hooks.py

@@ -136,7 +136,6 @@ class CephHooksTestCase(unittest.TestCase):
                 write_file=DEFAULT,
                 nrpe=DEFAULT,
                 emit_cephconf=DEFAULT,
-                upgrade_keys=DEFAULT,
                 mon_relation_joined=DEFAULT,
                 is_relation_made=DEFAULT) as mocks, patch(
                     "charmhelpers.contrib.hardening.harden.config"):