Merge lp://qastaging/~bbaqar/charms/trusty/neutron-api/trunk into lp://qastaging/~plumgrid-team/charms/trusty/neutron-api/trunk
Proposed by
Bilal Baqar
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~bbaqar/charms/trusty/neutron-api/trunk |
| Merge into: | lp://qastaging/~plumgrid-team/charms/trusty/neutron-api/trunk |
| Diff against target: |
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) Text conflict in hooks/charmhelpers/contrib/hahelpers/cluster.py Text conflict in hooks/charmhelpers/contrib/openstack/neutron.py Conflict adding file templates/icehouse/plumgrid.ini. Moved existing file to templates/icehouse/plumgrid.ini.moved. |
| To merge this branch: | bzr merge lp://qastaging/~bbaqar/charms/trusty/neutron-api/trunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Narinder Gupta | Needs Fixing | ||
| Bilal Baqar | Pending | ||
|
Review via email:
|
|||
Description of the change
Resynced with lp:charms/trusty/neutron-api
To post a comment you must log in.
Revision history for this message
| Narinder Gupta (narindergupta) | # |
review:
Approve
Unmerged revisions
- 117. By Bilal Baqar
-
Adding changes for PLUMgrid neutron plugin
- 116. By Corey Bryant
-
[beisner,
r=corey. bryant] Point charmhelper sync and amulet tests at stable branches. - 115. By James Page
-
[gnuoy] 15.07 Charm release
- 114. By Billy Olsen
-
[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
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
it has few conflicts which needs to be removed before merge.