2.1 don't fallback on error #6933

Merged
merged 3 commits into from Feb 7, 2017

Conversation

Projects
None yet
3 participants
Owner

jameinel commented Feb 7, 2017

Description of change

We've had a number of bugs over time about containers ending up on the wrong bridge. One reason for this is that we have code that if there is an error while setting up a container, it falls back to using 'lxdbr0'. It did this because that was the only way to get containers on places where we were unable to ask the provider for extra IP addresses. We've since fixed the code to be more logical about it, and explicitly request 'lxdbr0' instead of falling back to it.

This removes the 'on error fallback' code, and finds one more edge case where the fallback was triggering. Namely on AWS we'll see lxdbr0 but we may not see an IP address on the bridge. Which was causing us to not create a DHCP allocated address for eth0.

QA steps

This should only really trigger when there is an error, but we should be sure that:

 $ juju bootstrap aws
 $ juju switch controller
 $ juju deploy ubuntu --to lxd:0
 $ juju status
 $ juju show-machine 0

Should show the container come up and get a 10.0.0.* address.

Documentation changes

Not directly user facing.

Bug reference

https://pad.lv/1656326

jameinel added some commits Feb 1, 2017

make errors in prepare fatal.
This also updates the KVM template code a little bit so
it treats the per-interface information as more important
than the Bridge Device information.
Owner

jameinel commented Feb 7, 2017

$$merge$$

Contributor

jujubot commented Feb 7, 2017

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

@jujubot jujubot merged commit 7fc3938 into juju:2.1 Feb 7, 2017

jameinel added a commit to jameinel/juju that referenced this pull request Feb 8, 2017

jujubot added a commit that referenced this pull request Feb 8, 2017

Merge pull request #6945 from jameinel/2.1-revert-no-fallback-1662947
Revert "Merge pull request #6933 from jameinel/2.1-no-fallback-1656326"

This reverts commit 7fc3938, reversing
changes made to 49316b2.

CI found that not all clouds act like my expectation, so just reverting to unblock next 2.1 release. They still are succeeding for the 'wrong' reasons, but that's life.

https://pad.lv/1662947 to revert the "fix" for https://pad.lv/1656326

@jameinel jameinel deleted the jameinel:2.1-no-fallback-1656326 branch Apr 22, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment