lp:~james-page/charm-helpers/multiple-https-networks

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:charm-helpers at revision 221

Liam Young (community): Approve on 2014-09-25

Diff: 638 lines (+313/-85)

7 files modified

charmhelpers/contrib/hahelpers/apache.py (+10/-3)
charmhelpers/contrib/hahelpers/cluster.py (+1/-2)
charmhelpers/contrib/openstack/context.py (+70/-24)
charmhelpers/contrib/openstack/templates/openstack_https_frontend (+9/-8)
tests/contrib/hahelpers/test_apache_utils.py (+34/-8)
tests/contrib/hahelpers/test_cluster_utils.py (+2/-2)
tests/contrib/openstack/test_os_contexts.py (+187/-38)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

232. By James Page on 2014-09-29

Refactor tests for new haproxy template format

231. By James Page on 2014-09-29

Cleanup template a bit

230. By James Page on 2014-09-29

Trim whitespace

229. By James Page on 2014-09-29

Tweak acl names

228. By James Page on 2014-09-29

Remove whitespace

227. By James Page on 2014-09-29

Fixup network in template

226. By James Page on 2014-09-29

Update haproxy again

225. By James Page on 2014-09-29

Tidy formatting

224. By James Page on 2014-09-29

TODO: update unit tests

223. By James Page on 2014-09-29

Fixup templates