lp:~1chb1n/charms/trusty/ceilometer/next-amulet-fix-lp1440758

Branch merges

Propose for merging

No branches dependent on this one.

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

Corey Bryant (community): Approve on 2015-04-09

charmers: Pending requested 2015-04-09

Diff: 21 lines (+2/-2)

1 file modified

tests/basic_deployment.py (+2/-2)

api

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

charmers: Pending requested 2015-04-09

Diff: 3219 lines (+2437/-132) (has conflicts)

45 files modified

Makefile (+12/-2)
README.md (+2/-1)
charm-helpers-tests.yaml (+5/-0)
config.yaml (+6/-0)
hooks/ceilometer_hooks.py (+25/-0)
hooks/ceilometer_utils.py (+3/-2)
hooks/charmhelpers/contrib/charmsupport/nrpe.py (+41/-7)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+5/-1)
hooks/charmhelpers/contrib/network/ip.py (+84/-1)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+5/-2)
hooks/charmhelpers/contrib/openstack/context.py (+108/-9)
hooks/charmhelpers/contrib/openstack/files/__init__.py (+18/-0)
hooks/charmhelpers/contrib/openstack/files/check_haproxy.sh (+32/-0)
hooks/charmhelpers/contrib/openstack/files/check_haproxy_queue_depth.sh (+30/-0)
hooks/charmhelpers/contrib/openstack/ip.py (+37/-0)
hooks/charmhelpers/contrib/openstack/neutron.py (+70/-0)
hooks/charmhelpers/contrib/openstack/templates/zeromq (+14/-0)
hooks/charmhelpers/contrib/openstack/utils.py (+7/-72)
hooks/charmhelpers/contrib/python/packages.py (+2/-2)
hooks/charmhelpers/core/fstab.py (+4/-4)
hooks/charmhelpers/core/hookenv.py (+26/-0)
hooks/charmhelpers/core/host.py (+10/-6)
hooks/charmhelpers/core/services/helpers.py (+12/-4)
hooks/charmhelpers/core/strutils.py (+42/-0)
hooks/charmhelpers/core/sysctl.py (+2/-2)
hooks/charmhelpers/core/templating.py (+3/-3)
hooks/charmhelpers/core/unitdata.py (+477/-0)
hooks/charmhelpers/fetch/archiveurl.py (+10/-10)
hooks/charmhelpers/fetch/giturl.py (+1/-1)
templates/icehouse/ceilometer.conf (+9/-3)
tests/00-setup (+11/-0)
tests/14-basic-precise-icehouse (+11/-0)
tests/15-basic-trusty-icehouse (+9/-0)
tests/16-basic-trusty-juno (+11/-0)
tests/README (+53/-0)
tests/basic_deployment.py (+330/-0)
tests/charmhelpers/__init__.py (+38/-0)
tests/charmhelpers/contrib/__init__.py (+15/-0)
tests/charmhelpers/contrib/amulet/__init__.py (+15/-0)
tests/charmhelpers/contrib/amulet/deployment.py (+93/-0)
tests/charmhelpers/contrib/amulet/utils.py (+314/-0)
tests/charmhelpers/contrib/openstack/__init__.py (+15/-0)
tests/charmhelpers/contrib/openstack/amulet/__init__.py (+15/-0)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+111/-0)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+294/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1440758: ceilometer-next amulet test fails with "port:8767 != expected port:8777"

Undecided

Fix Released

Link a bug report

Related blueprints

77. By Ryan Beisner on 2015-04-09

expect conf file to define 8767 as ceilometer api socket, as haproxy is on 8777

76. By Ryan Beisner on 2015-04-09

flip amulet debug on

75. By Edward Hope-Morley on 2015-03-26

[hopem,r=wolsen]

If apache2 reload fails, try restart but ignore error for to
allow charm chance to retry (which is inline with how
restart_on_change() currently works). Ultimately we should
have a way to check that prerequisites for restart are met.

Closes-Bug: 1433114

74. By Edward Hope-Morley on 2015-03-26

[trivial] fix amulet missing https_keystone setting error

73. By Edward Hope-Morley on 2015-03-19

[hopem,r=wolsen]

Fixes SSL cert/key inject from config.

Closes-Bug: 1351401

72. By Edward Hope-Morley on 2015-03-13

[hopem,r=gnuoy]

Implement PKI token signing.

Closes-Bug: 1309667

71. By James Page on 2015-03-04

Automated resync of charm-helpers

70. By Liam Young on 2015-02-26

[bradm, r=gnuoy] Add haproxy nrpe checks and setting of nagios_servicegroups

69. By Edward Hope-Morley on 2015-02-24

[trivial] charmhelpers sync

68. By Corey Bryant on 2015-02-20

[gnuoy,r=1chb1n,r=corey.bryant] Add basic Amulet tests.