lp:~james-page/charms/trusty/nova-cloud-controller/network-splits-https

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next at revision 107

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

Diff: 1018 lines (+234/-452)

11 files modified

charm-helpers-hooks.yaml (+1/-2)
hooks/charmhelpers/contrib/hahelpers/ceph.py (+0/-297)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+56/-15)
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/nova_cc_hooks.py (+14/-18)
tests/charmhelpers/contrib/amulet/deployment.py (+15/-10)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+30/-33)
unit_tests/test_nova_cc_hooks.py (+3/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

113. By James Page on 2014-10-02

Resync

112. By James Page on 2014-10-02

Rebase, resync

111. By James Page on 2014-09-30

Resync helpers, deal with clustered HA + HTTPS

110. By James Page on 2014-09-26

Add cluster-relation-joined hook to ensure that internal address network is used if connected

109. By James Page on 2014-09-26

Resync helpers

108. By James Page on 2014-09-26

Drop a few more conditional sets of relation data

107. By James Page on 2014-09-26

Always present endpoints to keystone - this will just dtrt

106. By James Page on 2014-09-26

resync helpers

105. By James Page on 2014-09-23

Resync helpers

104. By James Page on 2014-09-22

Ensure all helpers are synced