lp:~james-page/charms/trusty/swift-proxy/network-splits-https

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openstack-charmers-archive/charms/trusty/swift-proxy/next at revision 62

Liam Young (community): Needs Fixing on 2014-10-06

Diff: 590 lines (+180/-178)

10 files modified

config.yaml (+0/-22)
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/swift_context.py (+1/-25)
hooks/swift_hooks.py (+18/-10)
tests/basic_deployment.py (+1/-2)
tests/charmhelpers/contrib/amulet/deployment.py (+15/-10)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+30/-33)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

71. By James Page on 2014-10-02

Drop use-https and associate configuration options

70. By James Page on 2014-10-02

Resync

69. By James Page on 2014-10-02

Rebase, resync

68. By James Page on 2014-09-30

Let super class deal with port mappings

67. By James Page on 2014-09-30

Resync helpers, deal with clustering + https in network splits

66. By James Page on 2014-09-26

Use internal address for cluster comms if connected

65. By James Page on 2014-09-26

Resync helpers

64. By James Page on 2014-09-26

Resync helpers

63. By James Page on 2014-09-23

Resync helpers

62. By James Page on 2014-09-22

Don't bother using local swift certs for now