/juju

provider/maas/add-juju-bridge: revert back to using ifupdown package #5693

Merged
merged 5 commits into from Jun 22, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@frobware @jujubot
@frobware
Contributor

frobware commented Jun 22, 2016 •
Edited 1 time

This commit reverts back to using the ifupdown package for activating
the network configuration during bootstrap. We switched away from
using this package because bringing up interfaces that were bonds
using 802.3ad mode would never complete successfully resulting in
broken networking.

It turns out that this problem can be mitigated by adding short delay
between the two actions. In my experiments I have found that a 0.1
second delay is sufficient but this commit chooses a larger value (3s)
for machines that may have more than 1 bond and/or slower hardware.

Also cherry-picks the commit to put the bridge script in /var/tmp for precise.

Fixes LP:#1594855

(Review request: http://reviews.vapour.ws/r/5136/)
@frobware
Contributor

frobware commented Jun 22, 2016

$$fixes-1594855$$
@jujubot
Contributor

jujubot commented Jun 22, 2016

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

jujubot commented Jun 22, 2016

Build failed: Does not match ['fixes-1474607', 'fixes-1581157', 'fixes-1591290', 'fixes-1577949', 'fixes-1458585']
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/8234
@frobware
Contributor

frobware commented Jun 22, 2016

$$JFDI$$
@jujubot
Contributor

jujubot commented Jun 22, 2016

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

jujubot commented Jun 22, 2016

Build failed: Does not match ['fixes-1474607', 'fixes-1595155', 'fixes-1591290', 'fixes-1577949', 'fixes-1581157', 'fixes-1458585']
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/8236
@frobware
Contributor

frobware commented Jun 22, 2016

$$JFDI$$
@jujubot
Contributor

jujubot commented Jun 22, 2016

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

@jujubot jujubot merged commit fcff539 into juju:1.25 Jun 22, 2016

frobware pushed a commit to frobware/juju that referenced this pull request Jun 22, 2016

@jujubot
Merge pull request #5693 from frobware/1.25-lp1594855 
provider/maas/add-juju-bridge: revert back to using ifupdown package

This commit reverts back to using the ifupdown package for activating
the network configuration during bootstrap. We switched away from
using this package because bringing up interfaces that were bonds
using 802.3ad mode would never complete successfully resulting in
broken networking.

It turns out that this problem can be mitigated by adding short delay
between the two actions. In my experiments I have found that a 0.1
second delay is sufficient but this commit chooses a larger value (3s)
for machines that may have more than 1 bond and/or slower hardware.

Also cherry-picks the commit to put the bridge script in /var/tmp for precise.

Fixes [LP:#1594855](https://bugs.launchpad.net/juju-core/+bug/1594855)

(Review request: http://reviews.vapour.ws/r/5136/)
(cherry picked from commit fcff539)
37c0ee2

@frobware frobware referenced this pull request Jun 22, 2016

Merged

provider/maas/add-juju-bridge: revert to using ifupdown package #5697

jujubot added a commit that referenced this pull request Jun 22, 2016

@jujubot
Merge pull request #5697 from frobware/master-lp1594855 
provider/maas/add-juju-bridge: revert to using ifupdown package

Forward port of PR #5693 from 1.25 to master.

This commit reverts to using the ifupdown package for activating the
network configuration during bootstrap. We switched away from using
this package because bringing up interfaces that were bonds using
802.3ad mode would never complete successfully resulting in broken
networking.
    
It turns out that this problem can be mitigated by adding short delay
between the two actions. In my experiments I have found that a 0.1
second delay is sufficient but this commit chooses a larger value (3s)
for machines that may have more than 1 bond and/or slower hardware.

This commit additionally copies the bridge script unit tests to match the
version and semantic behaviour of the add-juju-bridge.py script.

Fixes [LP:#1594855](https://bugs.launchpad.net/juju-core/+bug/1594855)

(Review request: http://reviews.vapour.ws/r/5140/)
cc02536
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment