lp://qastaging/~openstack-charmers/charms/trusty/nova-cloud-controller/0mq

Branch merges

Propose for merging

No branches dependent on this one.

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

Liam Young (community): Approve on 2015-04-01

Ryan Beisner (community): Needs Fixing on 2015-01-16

James Page: Needs Fixing on 2014-10-22

Diff: 919 lines (+554/-91)

16 files modified

hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+25/-2)
hooks/charmhelpers/contrib/openstack/context.py (+144/-1)
hooks/charmhelpers/contrib/openstack/templates/git.upstart (+13/-0)
hooks/charmhelpers/contrib/openstack/templates/section-zeromq (+14/-0)
hooks/charmhelpers/contrib/openstack/templates/zeromq (+0/-14)
hooks/charmhelpers/contrib/openstack/utils.py (+124/-69)
hooks/charmhelpers/core/unitdata.py (+1/-1)
hooks/nova_cc_hooks.py (+20/-2)
hooks/nova_cc_utils.py (+9/-0)
metadata.yaml (+3/-0)
templates/icehouse/neutron.conf (+2/-0)
templates/juno/nova.conf (+156/-0)
templates/kilo/nova.conf (+2/-0)
templates/kilo/zeromq (+14/-0)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+25/-2)
unit_tests/test_nova_cc_hooks.py (+2/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

128. By James Page on 2015-03-31

Rebase

127. By James Page on 2015-03-30

Rebase, resync

126. By James Page on 2015-03-16

Make 0mq support >= kilo

125. By James Page on 2015-03-16

Rebase

124. By James Page on 2015-02-24

Reorder zeromq inclusion

123. By James Page on 2015-02-24

Specialized zeromq snippet for kilo

122. By James Page on 2015-02-24

Move zeromq section to correct part of file

121. By James Page on 2015-02-24

Mark juno template as juno

120. By James Page on 2015-02-24

Drop zeromq support in icehouse

119. By James Page on 2015-02-24

Use nova package for os check