Juju Charms Collection
ceilometer-agent package

Merge lp://staging/~corey.bryant/charms/trusty/ceilometer-agent/action-managed-upgrade into lp://staging/~openstack-charmers-archive/charms/trusty/ceilometer-agent/next

  1. Trusty Tahr (14.04)
  2. action-managed-upgrade
  3. Merge into next
Proposed by Corey Bryant
Status: Merged
Merged at revision: 65
Proposed branch: lp://staging/~corey.bryant/charms/trusty/ceilometer-agent/action-managed-upgrade
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/ceilometer-agent/next
Diff against target: 2040 lines (+1505/-103)
18 files modified
actions.yaml (+2/-0)
actions/openstack_upgrade.py (+39/-0)
config.yaml (+10/-0)
hooks/ceilometer_hooks.py (+3/-2)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+20/-5)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+359/-0)
hooks/charmhelpers/contrib/openstack/context.py (+8/-9)
hooks/charmhelpers/contrib/openstack/utils.py (+51/-0)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+226/-13)
hooks/charmhelpers/core/host.py (+32/-16)
hooks/charmhelpers/core/kernel.py (+68/-0)
tests/basic_deployment.py (+1/-1)
tests/charmhelpers/contrib/amulet/utils.py (+243/-52)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+20/-5)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+359/-0)
unit_tests/__init__.py (+1/-0)
unit_tests/test_actions_openstack_upgrade.py (+55/-0)
unit_tests/test_ceilometer_hooks.py (+8/-0)
To merge this branch: bzr merge lp://staging/~corey.bryant/charms/trusty/ceilometer-agent/action-managed-upgrade
Reviewer Review Type Date Requested Status
Billy Olsen Approve
Review via email: mp+271156@code.staging.launchpad.net
To post a comment you must log in.
lp://staging/~corey.bryant/charms/trusty/ceilometer-agent/action-managed-upgrade updated
72. By Corey Bryant

Drop bin file

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

charm_lint_check #10054 ceilometer-agent-next for corey.bryant mp271156
    LINT OK: passed

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

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

charm_unit_test #9220 ceilometer-agent-next for corey.bryant mp271156
    UNIT OK: passed

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

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

charm_amulet_test #6440 ceilometer-agent-next for corey.bryant mp271156
    AMULET OK: passed

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

lp://staging/~corey.bryant/charms/trusty/ceilometer-agent/action-managed-upgrade updated
73. By Corey Bryant

Update unit tests

74. By Corey Bryant

Fix unit test

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

charm_unit_test #9225 ceilometer-agent-next for corey.bryant mp271156
    UNIT OK: passed

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

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

charm_lint_check #10061 ceilometer-agent-next for corey.bryant mp271156
    LINT OK: passed

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

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

charm_amulet_test #6446 ceilometer-agent-next for corey.bryant mp271156
    AMULET OK: passed

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

Revision history for this message
Billy Olsen (billy-olsen) wrote :

LGTM, Approved. I also didn't see the kilo->icehouse->kilo template rendering here.

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