Added disable-network-management environment flag #618
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
| @@ -331,13 +343,13 @@ func (a *MachineAgent) APIWorker() (worker.Worker, error) { | |||
| }) | |||
| // TODO (mfoord 8/8/2014) improve the way we detect networking capabilities. Bug lp:1354365 | |||
| writeNetworkConfig := providerType == "maas" | |||
| if writeNetworkConfig { | |||
| if disableNetworkManagement || !writeNetworkConfig { | |||
There was a problem hiding this comment.
Oh, this influences my work, but looks like no problem.
There was a problem hiding this comment.
It does indeed and once this lands, when "disable-network-management" is true, the environ capability for "requires safe networker" should always return true for all providers (i.e. first check if it's disabled, then the rest of the conditions).
There was a problem hiding this comment.
So I have to postpone my PR until this landed. Wanted to push it yesterday, but due to the build problem I waited until now.
|
LGTM |
dimitern
force-pushed
the
lp-1361374-disable-network-management-flag
branch
from
39377c9
to
79313fb
Compare
|
fixes-1341524 |
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
jujubot
added a commit
that referenced
this pull request
Aug 27, 2014
…gement-flag Added disable-network-management environment flag A new environment config flag "disable-network-management" added, which is false when missing and by default, but when it's "true": * MAAS provider is not creating a network bridge or bringing eth0 up and down during cloudinit. * The networker worker is always run in safe mode, so no subsequent changes to the network config are made, or and ifup/ifdown commands will be run. This is intended as a "safety switch" to workaround a few bugs happening when using Juju on MAAS mostly, until Juju's network model works and integrates better with MAAS. List of related bugs: * http://pad.lv/1361374 - maas provider assumes machine uses dhcp for eth0 * http://pad.lv/1353008 - MAAS Provider: LXC did not get DHCP address, stuck in "pending" * http://pad.lv/1345433 - cloud-init network error when using MAAS/juju * http://pad.lv/1341524 - juju/MAAS deployed host with bonding configured via preseed missing eth0 from bond on first boot In any cases where MAAS and Juju are both trying to manage networking on machines, set "disable-network-management: true" in your environments.yaml file before bootstrap.
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.
A new environment config flag "disable-network-management" added,
which is false when missing and by default, but when it's "true":
up and down during cloudinit.
changes to the network config are made, or and ifup/ifdown commands
will be run.
This is intended as a "safety switch" to workaround a few bugs happening
when using Juju on MAAS mostly, until Juju's network model works and integrates
better with MAAS. List of related bugs:
In any cases where MAAS and Juju are both trying to manage networking
on machines, set "disable-network-management: true" in your environments.yaml
file before bootstrap.