Merge lp://staging/~james-page/charms/trusty/odl-controller/productionize into lp://staging/~openstack-charmers-archive/charms/trusty/odl-controller/next
Proposed by
James Page
Status: | Needs review |
---|---|
Proposed branch: | lp://staging/~james-page/charms/trusty/odl-controller/productionize |
Merge into: | lp://staging/~openstack-charmers-archive/charms/trusty/odl-controller/next |
Diff against target: |
3084 lines (+1448/-346) 37 files modified
.project (+17/-0) .pydevproject (+10/-0) config.yaml (+4/-0) files/odl-controller.service (+12/-0) hooks/charmhelpers/contrib/network/ip.py (+36/-19) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+10/-4) hooks/charmhelpers/contrib/openstack/context.py (+48/-10) hooks/charmhelpers/contrib/openstack/files/check_haproxy.sh (+7/-5) hooks/charmhelpers/contrib/openstack/neutron.py (+18/-8) hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+19/-11) hooks/charmhelpers/contrib/openstack/templates/section-keystone-authtoken (+11/-0) hooks/charmhelpers/contrib/openstack/utils.py (+218/-69) hooks/charmhelpers/contrib/python/packages.py (+35/-11) hooks/charmhelpers/contrib/storage/linux/ceph.py (+441/-59) hooks/charmhelpers/contrib/storage/linux/loopback.py (+10/-0) hooks/charmhelpers/core/hookenv.py (+41/-7) hooks/charmhelpers/core/host.py (+103/-43) hooks/charmhelpers/core/services/helpers.py (+11/-5) hooks/charmhelpers/core/templating.py (+13/-7) hooks/charmhelpers/fetch/__init__.py (+9/-1) hooks/charmhelpers/fetch/archiveurl.py (+1/-1) hooks/charmhelpers/fetch/bzrurl.py (+22/-32) hooks/charmhelpers/fetch/giturl.py (+20/-23) hooks/odl_controller_hooks.py (+26/-11) hooks/odl_controller_utils.py (+57/-4) hooks/odl_helper.py (+96/-0) tests/015-basic-trusty-icehouse (+1/-1) tests/016-basic-trusty-juno (+1/-1) tests/017-basic-trusty-kilo (+1/-1) tests/018-basic-trusty-liberty (+1/-1) tests/019-basic-trusty-mitaka (+1/-1) tests/020-basic-wily-liberty (+1/-1) tests/021-basic-xenial-mitaka (+1/-1) tests/basic_deployment.py (+2/-2) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+9/-4) unit_tests/test_odl_controller_hooks.py (+40/-2) unit_tests/test_odl_controller_utils.py (+95/-1) |
To merge this branch: | bzr merge lp://staging/~james-page/charms/trusty/odl-controller/productionize |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenStack Charmers | Pending | ||
Review via email:
|
To post a comment you must log in.
Unmerged revisions
- 50. By James Page
-
Make venv compat
- 49. By James Page
-
Update profiles to include aaa-api for password management
- 48. By James Page
-
Tidy unit tests
- 47. By James Page
-
Tidy pep8
- 46. By James Page
-
Resync helpers
- 45. By James Page
-
Merge opnfv stuff
- 44. By James Page
-
Rebase
- 43. By James Page
-
Merge amulet test fixes for neutron
- 42. By James Page
-
Resync helpers
- 41. By James Page
-
Rebase
charm_unit_test #838 odl-controller-next for james-page mp286718
UNIT OK: passed
Build: http:// 10.245. 162.36: 8080/job/ charm_unit_ test/838/