Merge lp:~cbjchen/charms/trusty/glance/remove_stale_key into lp:~openstack-charmers-archive/charms/trusty/glance/next

[Liang Chen]

Clean up the keyring for glance after ceph service is destroyed and re-created like below,

1. break relation
2. destroy service
3. deploy new ceph service
4. add relation back

If old key exists, ensure_ceph_keyring will not store the newly retrieved key from ceph.

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

charm_lint_check #1454 glance-next for cbjchen mp248164
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  hooks/glance_relations.py:272:1: W293 blank line contains whitespace
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/9962752/
Build: http://10.245.162.77:8080/job/charm_lint_check/1454/

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

charm_unit_test #1407 glance-next for cbjchen mp248164
    UNIT OK: passed

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

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

charm_amulet_test #1572 glance-next for cbjchen mp248164
    AMULET OK: passed

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

[lp:~cbjchen/charms/trusty/glance/remove_stale_key]

97. By Liang Chen <email address hidden> on 2015-01-30

Clean up stale ceph keyring

[cbjchen,r=]
Clean up the keyring after ceph relation is broken. So when next
time ceph relation is joined, ensure_ceph_keyring will not ignore
the new key because of the existance of the old one.

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

charm_lint_check #1456 glance-next for cbjchen mp248164
    LINT OK: passed

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

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

charm_unit_test #1409 glance-next for cbjchen mp248164
    UNIT OK: passed

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

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

charm_amulet_test #1574 glance-next for cbjchen mp248164
    AMULET OK: passed

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

[Edward Hope-Morley (hopem)]

LGTM +1

review: Approve

[Edward Hope-Morley (hopem)]

I've deployed this along with the other ceph client changes and it all seems good. Thanks Liang. +1

review: Approve

=== modified file 'hooks/glance_relations.py'
--- hooks/glance_relations.py	2015-01-22 16:26:28 +0000
+++ hooks/glance_relations.py	2015-01-30 22:43:09 +0000
@@ -63,6 +63,7 @@
     ensure_ceph_keyring,
     CephBrokerRq,
     CephBrokerRsp,
+    delete_keyring,
 )
 from charmhelpers.payload.execd import (
     execd_preinstall
@@ -263,6 +264,13 @@
             juju_log("Request(s) sent to Ceph broker (rid=%s)" % (rid))
 
 
[e-mail]('ceph-relation-broken')
+def ceph_broken():
+    service = service_name()
+    delete_keyring(service=service)
+    CONFIGS.write_all()
+
+
 @hooks.hook('identity-service-relation-joined')
 def keystone_joined(relation_id=None):
     public_url = '{}:9292'.format(canonical_url(CONFIGS, PUBLIC))
@@ -433,8 +441,7 @@
     [image_service_joined(rid) for rid in relation_ids('image-service')]
 
 
[e-mail]('ceph-relation-broken',
-            'identity-service-relation-broken',
[e-mail]('identity-service-relation-broken',
             'object-store-relation-broken',
             'shared-db-relation-broken',
             'pgsql-db-relation-broken')

=== modified file 'unit_tests/test_glance_relations.py'
--- unit_tests/test_glance_relations.py	2015-01-22 16:55:57 +0000
+++ unit_tests/test_glance_relations.py	2015-01-30 22:43:09 +0000
@@ -64,6 +64,7 @@
     'get_iface_for_address',
     'get_ipv6_addr',
     'sync_db_with_multi_ipv6_addresses',
+    'delete_keyring',
 ]
 
 
@@ -381,6 +382,13 @@
                            call(self.ceph_config_file())],
                           configs.write.call_args_list)
 
+    @patch.object(relations, 'CONFIGS')
+    def test_ceph_broken(self, configs):
+        self.service_name.return_value = 'glance'
+        relations.ceph_broken()
+        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'
         relations.keystone_joined()