/juju

Fixed lp:1414016 - Ensure LXC config has correct network settings ordering #1480

Merged
merged 1 commit into from Jan 26, 2015

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@dimitern @wallyworld @jujubot
@dimitern
Contributor

dimitern commented Jan 24, 2015

This addresses the following critical bug - http://pad.lv/1414016.
In essence, the fix causes the generated LXC config files to have
correct ordering of lxc.network.* settings as the lxc tools expects.
All lxc.network.* settings found before an lxc.network.type setting
are moved after that lxc.network.type line.

This can mostly happen when cloning from a template with incorrect
settings, but is also enforced when not using lxc-clone for consistency.

Extensively tested with the local provider and different combinations
of lxc-clone, lxc-clone-aufs settings, trusty and precise images, in
a clean setup or with pre-existing juju-*-lxc-template containers.

(Review request: http://reviews.vapour.ws/r/802/)
@wallyworld
Owner

wallyworld commented Jan 25, 2015

$$fixes-1414016$$
@jujubot
Contributor

jujubot commented Jan 25, 2015

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

jujubot commented Jan 25, 2015

Build failed: Generating tarball failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/1921
@wallyworld
Owner

wallyworld commented Jan 25, 2015

$$fixes-1414016$$
@jujubot
Contributor

jujubot commented Jan 25, 2015

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

jujubot commented Jan 25, 2015

Build failed: Generating tarball failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/1922
@wallyworld
Owner

wallyworld commented Jan 25, 2015

$$fixes-1414016$$
@jujubot
Contributor

jujubot commented Jan 25, 2015

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

jujubot commented Jan 25, 2015

Build failed: Generating tarball failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/1923
@wallyworld
Owner

wallyworld commented Jan 25, 2015

$$fixes-1414016$$
@jujubot
Contributor

jujubot commented Jan 25, 2015

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

jujubot commented Jan 25, 2015

Build failed: Generating tarball failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/1924
@dimitern
Contributor

dimitern commented Jan 25, 2015

JFDI
$$fixes-1414016$$
@jujubot
Contributor

jujubot commented Jan 25, 2015

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

jujubot commented Jan 25, 2015

Build failed: Generating tarball failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/1925
@dimitern
Contributor

dimitern commented Jan 25, 2015

Aw c'mon... there is not a single file in the repo containing "labix.org" except some slightly outdated docs! CI scripts seem overzealous.
@dimitern
Contributor

dimitern commented Jan 26, 2015

$$tryagain$$
@jujubot
Contributor

jujubot commented Jan 26, 2015

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

jujubot added a commit that referenced this pull request Jan 26, 2015

@jujubot
Merge pull request #1480 from dimitern/lp-1414016-enforce-lxc-network… 
…-settings-order

Fixed lp:1414016 - Ensure LXC config has correct network settings ordering

This addresses the following critical bug - http://pad.lv/1414016.
In essence, the fix causes the generated LXC config files to have
correct ordering of lxc.network.* settings as the lxc tools expects.
All lxc.network.* settings found before an lxc.network.type setting
are moved after that lxc.network.type line.

This can mostly happen when cloning from a template with incorrect
settings, but is also enforced when not using lxc-clone for consistency.

Extensively tested with the local provider and different combinations
of lxc-clone, lxc-clone-aufs settings, trusty and precise images, in
a clean setup or with pre-existing juju-*-lxc-template containers.

(Review request: http://reviews.vapour.ws/r/802/)
e322b48

@jujubot jujubot merged commit e322b48 into juju:master Jan 26, 2015

@dimitern dimitern deleted the dimitern:lp-1414016-enforce-lxc-network-settings-order branch Jan 26, 2015

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