Juju Charms Collection
glance package

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

  1. Trusty Tahr (14.04)
  2. remove_stale_key
  3. Merge into next
Proposed by Liang Chen
Status: Merged
Merged at revision: 97
Proposed branch: lp://qastaging/~cbjchen/charms/trusty/glance/remove_stale_key
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/glance/next
Diff against target: 61 lines (+17/-2)
2 files modified
hooks/glance_relations.py (+9/-2)
unit_tests/test_glance_relations.py (+8/-0)
To merge this branch: bzr merge lp://qastaging/~cbjchen/charms/trusty/glance/remove_stale_key
Reviewer Review Type Date Requested Status
Edward Hope-Morley Approve
OpenStack Charmers Pending
Review via email: mp+248164@code.qastaging.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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://qastaging/~cbjchen/charms/trusty/glance/remove_stale_key updated
97. By Liang Chen <email address hidden>

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.

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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

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

Revision history for this message
Edward Hope-Morley (hopem) wrote :

LGTM +1

review: Approve
Revision history for this message
Edward Hope-Morley (hopem) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches