lp:~gnuoy/charms/trusty/cisco-vpp/dhcp

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openstack-charmers/charms/trusty/cisco-vpp/next at revision 116

James Page: Approve on 2015-12-02

Diff: 5609 lines (+3361/-493)

40 files modified

charm-helpers-hooks.yaml (+1/-1)
config.yaml (+8/-0)
hooks/ODL.py (+2/-1)
hooks/charmhelpers/contrib/network/ip.py (+10/-4)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+158/-15)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+742/-51)
hooks/charmhelpers/contrib/openstack/context.py (+192/-63)
hooks/charmhelpers/contrib/openstack/neutron.py (+57/-16)
hooks/charmhelpers/contrib/openstack/templates/ceph.conf (+12/-6)
hooks/charmhelpers/contrib/openstack/templating.py (+32/-29)
hooks/charmhelpers/contrib/openstack/utils.py (+324/-33)
hooks/charmhelpers/contrib/python/packages.py (+2/-0)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+272/-43)
hooks/charmhelpers/contrib/storage/linux/loopback.py (+10/-0)
hooks/charmhelpers/contrib/storage/linux/utils.py (+4/-3)
hooks/charmhelpers/core/files.py (+45/-0)
hooks/charmhelpers/core/hookenv.py (+249/-49)
hooks/charmhelpers/core/host.py (+148/-36)
hooks/charmhelpers/core/hugepage.py (+33/-16)
hooks/charmhelpers/core/kernel.py (+68/-0)
hooks/charmhelpers/core/services/base.py (+12/-9)
hooks/charmhelpers/core/services/helpers.py (+9/-7)
hooks/charmhelpers/core/strutils.py (+30/-0)
hooks/charmhelpers/core/templating.py (+12/-12)
hooks/charmhelpers/core/unitdata.py (+61/-17)
hooks/charmhelpers/fetch/__init__.py (+31/-14)
hooks/charmhelpers/fetch/archiveurl.py (+7/-1)
hooks/charmhelpers/fetch/giturl.py (+1/-1)
hooks/services.py (+28/-0)
hooks/vpp_data.py (+75/-0)
hooks/vpp_utils.py (+2/-1)
metadata.yaml (+4/-0)
templates/icehouse/dhcp_agent.ini (+13/-0)
templates/icehouse/metadata_agent.ini (+15/-0)
templates/icehouse/neutron.conf (+31/-0)
templates/parts/rabbitmq (+21/-0)
tests/charmhelpers/contrib/amulet/utils.py (+239/-9)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+38/-4)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+361/-51)
unit_tests/test_vpp_utils.py (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

124. By Liam Young on 2015-12-01

General tidyup/fixes from mp feedback from JamesPage

123. By Liam Young on 2015-12-01

Fix bug causing charm to fail if /etc/neutron does not exists

122. By Liam Young on 2015-12-01

ODL initially returns 404s when querying nodes so backoff and retry node query

121. By Liam Young on 2015-11-27

Fix typo in context that was retuning the wrong ip for keystone

120. By Liam Young on 2015-11-27

Use new NSNullDriver for dhcp and use namespaces

119. By Liam Young on 2015-11-26

Fix error writing shared_secret before /etc/neutron has been created

118. By Liam Young on 2015-11-26

Added metadata support

117. By Liam Young on 2015-11-25

Fix missing driver

116. By Liam Young on 2015-11-20

Add dhcp/metadata support

115. By James Page on 2015-11-18

Update amulet tests