lp:~james-page/charms/trusty/cinder/https-multi-network

Branch merges

Propose for merging

No branches dependent on this one.

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

Liam Young (community): Approve on 2014-10-06

Diff: 530 lines (+176/-132)

8 files modified

hooks/charmhelpers/contrib/network/ip.py (+2/-0)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+30/-33)
hooks/charmhelpers/contrib/openstack/context.py (+68/-32)
hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+15/-11)
hooks/cinder_hooks.py (+17/-19)
unit_tests/test_cinder_contexts.py (+15/-15)
unit_tests/test_cinder_hooks.py (+2/-7)
unit_tests/test_cluster_hooks.py (+27/-15)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

59. By James Page on 2014-10-02

Resync

58. By James Page on 2014-10-01

Minor fixup

57. By James Page on 2014-10-01

Rebase and resync

56. By James Page on 2014-09-30

Backout last change

55. By James Page on 2014-09-30

Write out configurations in ha-changed to avoid missing switch to VIP's

54. By James Page on 2014-09-29

Resync helpers

53. By James Page on 2014-09-29

Resync helpers

52. By James Page on 2014-09-29

Resync helpers, deal with HTTPS+HA multibackends in haproxy

51. By James Page on 2014-09-26

Resync helpers

50. By James Page on 2014-09-26

Resync trunk helpers.

Drop eligible leader checks for cluster and identity relations; setting
this data is always a good idea so that a consistent set of data is
presented to keystone.