Merge lp://staging/~james-page/charms/trusty/odl-controller/profiles into lp://staging/~sdn-charmers/charms/trusty/odl-controller/trunk
Proposed by
James Page
| Status: | Merged |
|---|---|
| Merged at revision: | 5 |
| Proposed branch: | lp://staging/~james-page/charms/trusty/odl-controller/profiles |
| Merge into: | lp://staging/~sdn-charmers/charms/trusty/odl-controller/trunk |
| Diff against target: |
230 lines (+117/-16) 3 files modified
config.yaml (+19/-1) hooks/odl_controller_hooks.py (+24/-14) hooks/odl_controller_utils.py (+74/-1) |
| To merge this branch: | bzr merge lp://staging/~james-page/charms/trusty/odl-controller/profiles |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Robert Ayres (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Adds support for SDN profiles and http/https proxy configuration for ODL only.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Minor comments:
* Use double quotes (") for strings everywhere.
* Use .format() over % for string formatting.
* Remove the empty 'default:' attributes from config.yaml where there is no default.
Otherwise, +1 to merge.