lp:~james-page/charms/trusty/neutron-api/network-splits-https

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openstack-charmers-archive/charms/trusty/neutron-api/next at revision 48

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

Diff: 501 lines (+154/-108)

7 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/neutron_api_hooks.py (+16/-12)
unit_tests/test_neutron_api_context.py (+17/-3)
unit_tests/test_neutron_api_hooks.py (+6/-17)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

53. By James Page on 2014-10-02

Resync

52. By James Page on 2014-10-02

Rebase, resync

51. By James Page on 2014-09-30

Rebase

50. By James Page on 2014-09-30

Rebase on parent

49. By James Page on 2014-09-30

Rebase on parent

48. By James Page on 2014-09-30

Backout last change

47. By James Page on 2014-09-30

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

46. By James Page on 2014-09-30

Fixup unit tests for new context helpers

45. By James Page on 2014-09-26

Fixup cluster relation to use internal address if set

44. By James Page on 2014-09-26

Resync helpers