Merge lp://staging/~plumgrid-team/charms/trusty/neutron-api-plumgrid/trunk into lp://staging/charms/trusty/neutron-api-plumgrid
Proposed by
Bilal Baqar
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 8 | ||||
| Proposed branch: | lp://staging/~plumgrid-team/charms/trusty/neutron-api-plumgrid/trunk | ||||
| Merge into: | lp://staging/charms/trusty/neutron-api-plumgrid | ||||
| Diff against target: |
10336 lines (+4626/-3509) 58 files modified
Makefile (+1/-1) bin/charm_helpers_sync.py (+253/-0) charm-helpers-sync.yaml (+6/-1) config.yaml (+30/-2) hooks/charmhelpers/contrib/amulet/deployment.py (+4/-2) hooks/charmhelpers/contrib/amulet/utils.py (+382/-86) hooks/charmhelpers/contrib/ansible/__init__.py (+0/-254) hooks/charmhelpers/contrib/benchmark/__init__.py (+0/-126) hooks/charmhelpers/contrib/charmhelpers/__init__.py (+0/-208) hooks/charmhelpers/contrib/charmsupport/__init__.py (+0/-15) hooks/charmhelpers/contrib/charmsupport/nrpe.py (+0/-360) hooks/charmhelpers/contrib/charmsupport/volumes.py (+0/-175) hooks/charmhelpers/contrib/database/mysql.py (+0/-412) hooks/charmhelpers/contrib/network/ip.py (+55/-23) hooks/charmhelpers/contrib/network/ovs/__init__.py (+6/-2) hooks/charmhelpers/contrib/network/ufw.py (+5/-6) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+135/-14) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+421/-13) hooks/charmhelpers/contrib/openstack/context.py (+318/-79) hooks/charmhelpers/contrib/openstack/ip.py (+35/-7) hooks/charmhelpers/contrib/openstack/neutron.py (+64/-23) hooks/charmhelpers/contrib/openstack/templating.py (+30/-2) hooks/charmhelpers/contrib/openstack/utils.py (+939/-70) hooks/charmhelpers/contrib/peerstorage/__init__.py (+0/-268) hooks/charmhelpers/contrib/python/packages.py (+35/-11) hooks/charmhelpers/contrib/saltstack/__init__.py (+0/-118) hooks/charmhelpers/contrib/ssl/__init__.py (+0/-94) hooks/charmhelpers/contrib/ssl/service.py (+0/-279) hooks/charmhelpers/contrib/storage/linux/ceph.py (+823/-61) hooks/charmhelpers/contrib/storage/linux/loopback.py (+10/-0) hooks/charmhelpers/contrib/storage/linux/utils.py (+8/-7) hooks/charmhelpers/contrib/templating/__init__.py (+0/-15) hooks/charmhelpers/contrib/templating/contexts.py (+0/-139) hooks/charmhelpers/contrib/templating/jinja.py (+0/-39) hooks/charmhelpers/contrib/templating/pyformat.py (+0/-29) hooks/charmhelpers/contrib/unison/__init__.py (+0/-313) hooks/charmhelpers/core/hookenv.py (+220/-13) hooks/charmhelpers/core/host.py (+298/-75) hooks/charmhelpers/core/hugepage.py (+71/-0) hooks/charmhelpers/core/kernel.py (+68/-0) hooks/charmhelpers/core/services/helpers.py (+30/-5) hooks/charmhelpers/core/strutils.py (+30/-0) hooks/charmhelpers/core/templating.py (+21/-8) hooks/charmhelpers/core/unitdata.py (+61/-17) hooks/charmhelpers/fetch/__init__.py (+18/-2) hooks/charmhelpers/fetch/archiveurl.py (+1/-1) hooks/charmhelpers/fetch/bzrurl.py (+22/-32) hooks/charmhelpers/fetch/giturl.py (+20/-23) hooks/neutron_plumgrid_context.py (+59/-46) hooks/neutron_plumgrid_hooks.py (+20/-1) hooks/neutron_plumgrid_utils.py (+61/-11) metadata.yaml (+7/-0) templates/kilo/pgrc (+8/-0) templates/kilo/plumgrid.ini (+22/-0) templates/kilo/plumlib.ini (+5/-2) unit_tests/test_neutron_plumgrid_plugin_context.py (+20/-18) unit_tests/test_neutron_plumgrid_plugin_hooks.py (+1/-0) unit_tests/test_neutron_plumgrid_plugin_utils.py (+3/-1) |
||||
| To merge this branch: | bzr merge lp://staging/~plumgrid-team/charms/trusty/neutron-api-plumgrid/trunk | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Review Queue (community) | automated testing | Needs Fixing | |
| Charles Butler | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2016-03-03.
Commit message
Trusty - Liberty/Mitaka support added
Description of the change
- Mitaka/Liberty support added
- L2 Vtep and ECMP support added
- pip proxy option added
- removed unused charmhelpers modules
- synced latest charmhelpers modules
- updated charm-helpers-
- added connected type config
- getting pg vip and creds from director relation
To post a comment you must log in.
Revision history for this message
| Bilal Baqar (bbaqar) wrote | # |
Revision history for this message
| Review Queue (review-queue) wrote | # |
review:
Needs Fixing
(automated testing)
Revision history for this message
| Review Queue (review-queue) wrote | # |
review:
Needs Fixing
(automated testing)
Revision history for this message
| Bilal Baqar (bbaqar) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
tests/files/