lp:~bbaqar/charms/trusty/neutron-api/trunk

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:~plumgrid-team/charms/trusty/neutron-api/trunk

Narinder Gupta: Needs Fixing on 2015-08-25

Bilal Baqar: Pending requested 2015-08-24

Diff: 5202 lines (+2799/-627) (has conflicts)

45 files modified

README.md (+71/-73)
charm-helpers-hooks.yaml (+1/-0)
config.yaml (+66/-38)
hooks/charmhelpers/cli/__init__.py (+195/-0)
hooks/charmhelpers/cli/benchmark.py (+36/-0)
hooks/charmhelpers/cli/commands.py (+32/-0)
hooks/charmhelpers/cli/host.py (+31/-0)
hooks/charmhelpers/cli/unitdata.py (+39/-0)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+46/-2)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+42/-5)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+361/-51)
hooks/charmhelpers/contrib/openstack/context.py (+47/-34)
hooks/charmhelpers/contrib/openstack/ip.py (+49/-44)
hooks/charmhelpers/contrib/openstack/neutron.py (+33/-9)
hooks/charmhelpers/contrib/openstack/templates/ceph.conf (+6/-6)
hooks/charmhelpers/contrib/openstack/templating.py (+2/-2)
hooks/charmhelpers/contrib/openstack/utils.py (+88/-24)
hooks/charmhelpers/contrib/python/packages.py (+30/-5)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+6/-6)
hooks/charmhelpers/contrib/storage/linux/utils.py (+1/-1)
hooks/charmhelpers/core/files.py (+45/-0)
hooks/charmhelpers/core/hookenv.py (+352/-44)
hooks/charmhelpers/core/host.py (+56/-12)
hooks/charmhelpers/core/services/base.py (+43/-19)
hooks/charmhelpers/core/services/helpers.py (+2/-2)
hooks/charmhelpers/core/unitdata.py (+61/-17)
hooks/charmhelpers/fetch/__init__.py (+24/-15)
hooks/charmhelpers/fetch/archiveurl.py (+7/-1)
hooks/charmhelpers/fetch/giturl.py (+8/-6)
hooks/neutron_api_context.py (+16/-12)
hooks/neutron_api_utils.py (+38/-1)
templates/git/upstart/neutron-server.upstart (+1/-1)
templates/icehouse/ml2_conf.ini (+2/-2)
templates/icehouse/plumgrid.ini (+20/-0)
templates/kilo/ml2_conf.ini (+2/-2)
tests/00-setup (+1/-0)
tests/018-basic-utopic-juno (+0/-9)
tests/052-basic-trusty-kilo-git (+12/-0)
tests/basic_deployment.py (+187/-100)
tests/charmhelpers/contrib/amulet/utils.py (+219/-9)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+42/-5)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+361/-51)
unit_tests/test_neutron_api_context.py (+24/-10)
unit_tests/test_neutron_api_hooks.py (+37/-7)
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

117. By Bilal Baqar on 2015-08-24

Adding changes for PLUMgrid neutron plugin

116. By Corey Bryant on 2015-08-10

[beisner,r=corey.bryant] Point charmhelper sync and amulet tests at stable branches.

115. By James Page on 2015-08-10

[gnuoy] 15.07 Charm release

114. By Billy Olsen on 2015-06-18

[billy-olsen,r=corey.bryant] Add support for overriding public endpoint addresses.

Adds in the config option for overriding public endpoint addresses
and introduces a unit tests to ensure that the override for the
public address is functioning correctly.

Backported from /next
Closes-Bug: #1398182

113. By Corey Bryant on 2015-04-30

[corey.bryant,trivial] Update deploy from source README indentation.

112. By Corey Bryant on 2015-04-30

[corey.bryant,trivial] Update deploy from source README samples.

111. By Corey Bryant on 2015-04-28

[corey.bryant,trivial] Fix deploy from source README

110. By Liam Young on 2015-04-24

Point charmhelper sync and amulet tests at stable branches

109. By Liam Young on 2015-04-23

[gnuoy,trivial] Pre-release charmhelper sync

108. By James Page on 2015-04-23

[gnuoy,r=james-page] Conditional migration of neutron db in neutron-api for >=kilo