lp://qastaging/~thedac/charms/trusty/neutron-api/object-complete-context

Branch merges

Propose for merging

No branches dependent on this one.

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

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

Diff: 343 lines (+89/-2)

5 files modified

hooks/charmhelpers/core/hookenv.py (+1/-0)
hooks/neutron_api_hooks.py (+47/-2)
hooks/neutron_api_utils.py (+37/-0)
unit_tests/test_actions_git_reinstall.py (+1/-0)
unit_tests/test_utils.py (+3/-0)

api

Superseded for merging into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/trunk

charmers: Pending requested 2015-07-20

Diff: 3140 lines (+1381/-247) (has conflicts)

28 files modified

README.md (+83/-0)
config.yaml (+7/-4)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+46/-2)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+6/-2)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+122/-3)
hooks/charmhelpers/contrib/openstack/context.py (+47/-8)
hooks/charmhelpers/contrib/openstack/neutron.py (+16/-9)
hooks/charmhelpers/contrib/openstack/templating.py (+23/-1)
hooks/charmhelpers/contrib/openstack/utils.py (+172/-23)
hooks/charmhelpers/contrib/python/packages.py (+30/-5)
hooks/charmhelpers/core/hookenv.py (+232/-38)
hooks/charmhelpers/core/host.py (+25/-7)
hooks/charmhelpers/core/services/base.py (+32/-11)
hooks/charmhelpers/fetch/__init__.py (+1/-1)
hooks/charmhelpers/fetch/giturl.py (+7/-5)
hooks/neutron_api_context.py (+16/-12)
hooks/neutron_api_hooks.py (+25/-1)
hooks/neutron_api_utils.py (+45/-1)
metadata.yaml (+1/-1)
templates/git/upstart/neutron-server.upstart (+1/-1)
templates/icehouse/ml2_conf.ini (+2/-2)
templates/kilo/ml2_conf.ini (+2/-2)
tests/basic_deployment.py (+140/-85)
tests/charmhelpers/contrib/amulet/utils.py (+91/-6)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+6/-2)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+122/-3)
unit_tests/test_neutron_api_context.py (+24/-10)
unit_tests/test_neutron_api_utils.py (+57/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

139. By David Ames on 2015-10-02

[thedac, trivial] s/message/messaging

138. By David Ames on 2015-09-28

Pull in upstream

137. By David Ames on 2015-09-28

Track neutron-plugin-api

136. By David Ames on 2015-09-25

Use check_optional_relations

135. By David Ames on 2015-09-24

Fix unit tests

134. By David Ames on 2015-09-15

Unit is ready

133. By David Ames on 2015-09-15

More renames

132. By David Ames on 2015-09-15

Rename incomplete_contexts incomplete_relation_data

131. By David Ames on 2015-09-11

Renames and add ha check for vip settings

130. By David Ames on 2015-08-05

Merge Upstream