Merge lp://qastaging/~ddellav/charms/trusty/nova-compute/upgrade-action into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Proposed by
David Della Vecchia
Status: | Merged |
---|---|
Merged at revision: | 174 |
Proposed branch: | lp://qastaging/~ddellav/charms/trusty/nova-compute/upgrade-action |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next |
Diff against target: |
482 lines (+222/-33) 14 files modified
actions.yaml (+2/-0) actions/openstack_upgrade.py (+32/-0) config.yaml (+10/-0) hooks/charmhelpers/contrib/network/ip.py (+5/-3) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+1/-1) hooks/charmhelpers/contrib/openstack/context.py (+15/-4) hooks/charmhelpers/contrib/openstack/neutron.py (+3/-3) hooks/charmhelpers/core/hookenv.py (+32/-0) hooks/nova_compute_hooks.py (+2/-2) hooks/nova_compute_utils.py (+1/-3) tests/charmhelpers/contrib/amulet/utils.py (+47/-16) tests/charmhelpers/contrib/openstack/amulet/utils.py (+1/-1) unit_tests/test_actions_openstack_upgrade.py (+62/-0) unit_tests/test_nova_compute_hooks.py (+9/-0) |
To merge this branch: | bzr merge lp://qastaging/~ddellav/charms/trusty/nova-compute/upgrade-action |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Corey Bryant (community) | Approve | ||
Review via email:
|
Description of the change
Adding charmhelpers-based upgrade action to nova-compute.
To post a comment you must log in.
charm_lint_check #11392 nova-compute-next for ddellav mp273560
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/11392/