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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openstack-charmers-archive/charms/trusty/keystone/next at revision 81

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

James Page: Needs Resubmitting on 2014-10-06

Diff: 979 lines (+328/-235)

13 files modified

.pydevproject (+1/-0)
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/keystone_context.py (+60/-29)
hooks/keystone_hooks.py (+15/-8)
hooks/keystone_utils.py (+35/-24)
templates/icehouse/keystone.conf (+6/-4)
tests/charmhelpers/contrib/amulet/deployment.py (+15/-10)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+30/-33)
unit_tests/test_keystone_contexts.py (+44/-48)
unit_tests/test_keystone_hooks.py (+7/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

108. By James Page on 2014-10-06

Tidy after review

107. By James Page on 2014-10-02

Resync

106. By James Page on 2014-10-02

Rebase, resync

105. By James Page on 2014-09-29

Fixup unit tests for charm-helpers refactoring of haproxy for https+ha in multi-network configurations

104. By James Page on 2014-09-29

Resync helpers

103. By James Page on 2014-09-29

Resync helpers

102. By James Page on 2014-09-29

Resync helpers

101. By James Page on 2014-09-29

Resync helper

100. By James Page on 2014-09-29

Resync helpers

99. By James Page on 2014-09-29

Resync helpers