Merge lp:~thumper/juju-core/configurable-lxc-bridge into lp:~go-bot/juju-core/trunk
Proposed by
Tim Penhey
Status: | Merged |
---|---|
Approved by: | Tim Penhey |
Approved revision: | no longer in the source branch. |
Merged at revision: | 1938 |
Proposed branch: | lp:~thumper/juju-core/configurable-lxc-bridge |
Merge into: | lp:~go-bot/juju-core/trunk |
Diff against target: |
236 lines (+68/-40) 5 files modified
provider/local/config.go (+6/-0) provider/local/config_test.go (+39/-28) provider/local/environ.go (+15/-11) provider/local/environprovider.go (+7/-0) provider/local/instance.go (+1/-1) |
To merge this branch: | bzr merge lp:~thumper/juju-core/configurable-lxc-bridge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju Engineering | Pending | ||
Review via email: mp+188980@code.launchpad.net |
Commit message
Allow the network-bridge to be configured.
Enable the local provider config to accept network-bridge.
This is then passed through to the container creation
network config.
A slightly more informative message is added when the
bridge is not found.
Description of the change
Allow the network-bridge to be configured.
Enable the local provider config to accept network-bridge.
This is then passed through to the container creation
netowrk config.
A slightly more informative message is added when the
bridge is not found.
To post a comment you must log in.
Reviewers: mp+188980_ code.launchpad. net,
Message:
Please take a look.
Description:
Allow the network-bridge to be configured.
Enable the local provider config to accept network-bridge.
This is then passed through to the container creation
netowrk config.
A slightly more informative message is added when the
bridge is not found.
https:/ /code.launchpad .net/~thumper/ juju-core/ configurable- lxc-bridge/ +merge/ 188980
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/14321043/
Affected files (+70, -40 lines): local/config. go local/config_ test.go local/environ. go local/environpr ovider. go local/instance. go
A [revision details]
M provider/
M provider/
M provider/
M provider/
M provider/