lp:~tealeg/charms/trusty/ceilometer/pause-and-resume

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openstack-charmers-archive/charms/trusty/ceilometer/next at revision 96

Chris Glass (community): Approve on 2015-09-18

Alberto Donato (community): Approve on 2015-09-15

Diff: 847 lines (+599/-38)

12 files modified

actions.yaml (+4/-0)
actions/actions.py (+52/-0)
ceilometer_utils.py (+4/-4)
charmhelpers/contrib/openstack/amulet/deployment.py (+20/-5)
charmhelpers/contrib/openstack/amulet/utils.py (+359/-0)
charmhelpers/contrib/openstack/utils.py (+4/-0)
charmhelpers/contrib/storage/linux/ceph.py (+2/-11)
charmhelpers/core/host.py (+32/-16)
charmhelpers/core/kernel.py (+68/-0)
hooks/ceilometer_hooks.py (+1/-2)
tests/basic_deployment.py (+44/-0)
tests/charmhelpers/contrib/amulet/utils.py (+9/-0)

api

Superseded for merging into lp:~openstack-charmers-archive/charms/trusty/ceilometer/trunk

OpenStack Charmers: Pending requested 2015-09-10

Landscape: Pending requested 2015-09-10

Diff: 4038 lines (+2936/-456) (has conflicts)

32 files modified

actions.yaml (+4/-0)
actions/actions.py (+60/-0)
ceilometer_utils.py (+4/-4)
charmhelpers/cli/__init__.py (+191/-0)
charmhelpers/cli/benchmark.py (+36/-0)
charmhelpers/cli/commands.py (+32/-0)
charmhelpers/cli/hookenv.py (+23/-0)
charmhelpers/cli/host.py (+31/-0)
charmhelpers/cli/unitdata.py (+39/-0)
charmhelpers/contrib/network/ip.py (+5/-1)
charmhelpers/contrib/openstack/amulet/deployment.py (+24/-3)
charmhelpers/contrib/openstack/amulet/utils.py (+891/-263)
charmhelpers/contrib/openstack/context.py (+36/-5)
charmhelpers/contrib/openstack/neutron.py (+54/-3)
charmhelpers/contrib/openstack/utils.py (+69/-20)
charmhelpers/contrib/peerstorage/__init__.py (+269/-0)
charmhelpers/contrib/storage/linux/ceph.py (+2/-11)
charmhelpers/contrib/storage/linux/utils.py (+3/-2)
charmhelpers/core/files.py (+45/-0)
charmhelpers/core/hookenv.py (+226/-4)
charmhelpers/core/host.py (+136/-11)
charmhelpers/core/hugepage.py (+62/-0)
charmhelpers/core/kernel.py (+68/-0)
charmhelpers/core/services/helpers.py (+26/-2)
charmhelpers/fetch/__init__.py (+8/-0)
hooks/ceilometer_hooks.py (+1/-2)
tests/020-basic-trusty-liberty (+11/-0)
tests/021-basic-wily-liberty (+9/-0)
tests/basic_deployment.py (+299/-123)
tests/charmhelpers/contrib/amulet/utils.py (+246/-1)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+7/-1)
tests/tests.yaml (+19/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1494487: Add pause and resume actions to Ceilometer

Undecided

Fix Released

Link a bug report

Related blueprints

112. By Geoff Teale on 2015-09-17

Move ceilometer_contexts to root directory of charm and symlink to both hooks and actions.

111. By Geoff Teale on 2015-09-16

Use local linked ceilometer_utils.py in actions.

110. By Geoff Teale on 2015-09-15

Import CEILOMETER_SERVICES.

109. By Geoff Teale on 2015-09-15

Update the descriptions of the pause and resume actions.

108. By Geoff Teale on 2015-09-11

Merge forwards

107. By Geoff Teale on 2015-09-10

lint

106. By Geoff Teale on 2015-09-10

Test status, initially, post pause and post resume.

105. By Geoff Teale on 2015-09-10

Sync charm-helpers from branch with status-get.

104. By Geoff Teale on 2015-09-10

Tidy linting issues

103. By Geoff Teale on 2015-09-10

self._run_action not self.run_action.