Lxd fixes #5164
Closed
Lxd fixes #5164
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
| @@ -27,6 +27,8 @@ const ( | |||
| StatusCancelled = "Canceled" | |||
| StatusSuccess = "Success" | |||
| StatusFailure = "Failure" | |||
|
|
|||
| DefaultLXDBridge = "lxdbr0" | |||
There was a problem hiding this comment.
We don't need it because of the \n.
The fallback was buggy: lxdbr0 no longer starts automatically any more, so we can't assume that statting the file exists. This code is all mostly useless anyway as it was mostly for the transition from lxcbr0 to lxdbr0. Let's just get rid of any concept of falling back and just do what we did before. Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
| @@ -54,13 +54,9 @@ func (broker *lxdBroker) StartInstance(args environs.StartInstanceParams) (*envi | |||
| return nil, errors.New("starting lxd containers with networks is not supported yet") | |||
| } | |||
| machineId := args.InstanceConfig.MachineId | |||
| bridgeDevice := broker.agentConfig.Value(agent.LxcBridge) | |||
| bridgeDevice := broker.agentConfig.Value(agent.LxdBridge) | |||
There was a problem hiding this comment.
FWIW, as discussed on IRC - agent.LxcBridge is always empty, as it's not getting populated by providercommon.Bootstrap() used by most providers. So the if below is always going to succeed.
Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
|
This is against the wrong branch. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
(Review request: http://reviews.vapour.ws/r/4598/)