lp:~hopem/charms/trusty/cinder/ensure-apache-restart

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openstack-charmers-archive/charms/trusty/cinder/next at revision 82

Billy Olsen: Approve on 2015-03-30

Diff: 69 lines (+15/-5)

2 files modified

hooks/cinder_hooks.py (+8/-1)
unit_tests/test_cinder_hooks.py (+7/-4)

api

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

OpenStack Charmers: Pending requested 2015-03-29

Diff: 2088 lines (+1237/-190) (has conflicts)

32 files modified

charm-helpers-hooks.yaml (+4/-0)
config.yaml (+7/-1)
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)
hooks/cinder_hooks.py (+23/-2)
hooks/cinder_utils.py (+3/-1)
templates/icehouse/cinder.conf (+2/-1)
tests/basic_deployment.py (+17/-52)
tests/charmhelpers/contrib/amulet/utils.py (+122/-2)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+5/-2)
unit_tests/test_cinder_hooks.py (+14/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1410568: apache restart required on ssl cert update

High

Fix Released

Link a bug report

Related blueprints

82. By Edward Hope-Morley on 2015-03-30

use service_reload()

81. By Edward Hope-Morley on 2015-03-29

[hopem,r=]

Ensure apache2 reloaded/restarted when https configured

Closes-Bug: #1410568

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

[trivial] fix amulet missing https_keystone setting error

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

[hopem,r=wolsen]

Fixes SSL cert/key inject from config.

Closes-Bug: 1351401

78. By Edward Hope-Morley on 2015-03-16

[trivial] fix config.yaml typo

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

[hopem,r=gnuoy]

Implement PKI token signing.

Closes-Bug: 1309667

76. By James Page on 2015-03-04

Automated resync of charm-helpers

75. By Liam Young on 2015-02-26

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

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

[trivial] charmhelpers sync

73. By Corey Bryant on 2015-02-20

[gnuoy,r=1chb1n,r=corey.bryant] Fixup Amulet test for restart on config change.