lp:~billy-olsen/charms/trusty/ceilometer/ha

Branch merges

Propose for merging

No branches dependent on this one.

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

Edward Hope-Morley: Approve on 2014-12-18

Diff: 1318 lines (+985/-32)

16 files modified

charm-helpers.yaml (+1/-1)
config.yaml (+21/-1)
hooks/ceilometer_contexts.py (+59/-20)
hooks/ceilometer_hooks.py (+122/-1)
hooks/ceilometer_utils.py (+43/-2)
hooks/charmhelpers/contrib/openstack/templates/ceph.conf (+15/-0)
hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+54/-0)
hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend (+24/-0)
hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend.conf (+24/-0)
metadata.yaml (+6/-0)
ocf/openstack/ceilometer-agent-central (+345/-0)
setup.cfg (+1/-1)
templates/icehouse/ceilometer.conf (+36/-0)
unit_tests/test_ceilometer_contexts.py (+77/-5)
unit_tests/test_ceilometer_hooks.py (+152/-0)
unit_tests/test_ceilometer_utils.py (+5/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1379604: The Ceilometer charm does not support HA deployment

High

Fix Released

Link a bug report

Related blueprints

76. By Billy Olsen on 2014-12-17

Account for ssl port monitoring.
Ensure usage of upstream ceilometer-agent-central ocf (monitors amqp port).
Note: previous versions unintentionally used a modified version of the ocf
resource file which monitored keystone connections.

75. By Billy Olsen on 2014-12-17

Rebase with /next

74. By Billy Olsen on 2014-12-10

Add additional ceilometer services for restart.

73. By Billy Olsen on 2014-12-03

Refactor loop from code review feedback. Address possibility of the remote
value not being set prior to being used.

72. By Billy Olsen on 2014-12-03

Add shared-db-relation-departed hook to handle the scale-down scenario
of a mongodb server.

71. By Billy Olsen on 2014-11-19

Merge with /next

70. By Billy Olsen on 2014-11-19

sync charmhelpers code

69. By Billy Olsen on 2014-11-17

fix perms on ceilometer-agent-central

-------------o This line and the following will be ignored --------------

modified:
  ocf/openstack/ceilometer-agent-central*

68. By Billy Olsen on 2014-11-17

Use ocf resource instead of upstart resource for ceilometer-agent-central

67. By Billy Olsen on 2014-11-13

Updated tests and fixed some lint errors. Use grp_ceilometer_vips as
elected leader resource rather than calculating the vip resource.