Alon Bar-Lev has uploaded a new change for review. Change subject: host-deploy: ovirt-node: do not activate bridge plugin in non-legacy nodes ......................................................................
host-deploy: ovirt-node: do not activate bridge plugin in non-legacy nodes ovirt-node will be provided with or without the bridge per interface, in case we do not have these bridges we can allow the engine post installation to setup the networking. Change-Id: I1ecbec6c34a8a38518c0c36d1674c5fe820aac2b Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java 1 file changed, 17 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/25/17125/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java index 857e881..36d3684 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java @@ -91,6 +91,7 @@ private VDS _vds; private boolean _isNode = false; + private boolean _isLegacyNode = false; private boolean _reboot = false; private String _correlationId = null; private Exception _failException = null; @@ -276,6 +277,17 @@ return null; }}, new Callable<Object>() { public Object call() throws Exception { + if (_isNode) { + _isLegacyNode = (Boolean)_parser.cliEnvironmentGet( + VdsmEnv.OVIRT_NODE_HAS_OWN_BRIDGES + ); + } + else { + _parser.cliNoop(); + } + return null; + }}, + new Callable<Object>() { public Object call() throws Exception { _messages.post( InstallerMessages.Severity.INFO, String.format( @@ -375,17 +387,17 @@ VdsmEnv.MANAGEMENT_BRIDGE_NAME, _managementNetwork ); - } - else if (_isNode) { + } + else if (_isLegacyNode) { _parser.cliEnvironmentSet( VdsmEnv.MANAGEMENT_BRIDGE_NAME, NetworkUtils.getEngineNetwork() ); } else { - _parser.cliNoop(); - } - return null; + _parser.cliNoop(); + } + return null; }}, new Callable<Object>() { public Object call() throws Exception { -- To view, visit http://gerrit.ovirt.org/17125 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ecbec6c34a8a38518c0c36d1674c5fe820aac2b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
