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

Proposed by Liang Chen
Status: Merged
Merged at revision: 103
Proposed branch: lp://qastaging/~cbjchen/charms/trusty/nova-compute/remove_stale_key
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 180 lines (+83/-9)
7 files modified
.pydevproject (+2/-2)
README.md (+7/-0)
config.yaml (+1/-1)
hooks/nova_compute_hooks.py (+8/-1)
hooks/nova_compute_utils.py (+11/-4)
tests/basic_deployment.py (+1/-1)
unit_tests/test_nova_compute_utils.py (+53/-0)
To merge this branch: bzr merge lp://qastaging/~cbjchen/charms/trusty/nova-compute/remove_stale_key
Reviewer Review Type Date Requested Status
Edward Hope-Morley Approve
Review via email: mp+248949@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. There is another thing to be aware of for nova-compute node - stale libvirt secret key which will also be replaced with this patch. Though existing instances will not work anymore. There is nothing we can do in case the backend storage service(ceph) is destroyed. But this patch will at least make sure the nova-compute service continue to work.

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

charm_lint_check #1783 nova-compute-next for cbjchen mp248949
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  hooks/nova_compute_utils.py:27:9: W291 trailing whitespace
  make: *** [lint] Error 1

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

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

charm_unit_test #1611 nova-compute-next for cbjchen mp248949
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
  FAILED (SKIP=5, failures=1)
  make: *** [unit_test] Error 1

Full unit test output: http://paste.ubuntu.com/10110139/
Build: http://10.245.162.77:8080/job/charm_unit_test/1611/

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

charm_amulet_test #1803 nova-compute-next for cbjchen mp248949
    AMULET OK: passed

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

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. There is lint error but i'll fix when merging. 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