Alon Bar-Lev has uploaded a new change for review. Change subject: vdsm: packages: disable NetworkManager service by default ......................................................................
vdsm: packages: disable NetworkManager service by default NetworkManager causes timing issues with network service and vdsm. See rhbz#879180. Change-Id: Ie309c2939f44b3bc2f44eb9e892cbd118651a41a Signed-off-by: Alon Bar-Lev <[email protected]> --- M src/ovirt_host_deploy/constants.py M src/plugins/ovirt-host-deploy/vdsm/packages.py 2 files changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-host-deploy refs/changes/06/17306/1 diff --git a/src/ovirt_host_deploy/constants.py b/src/ovirt_host_deploy/constants.py index d0999b9..ee84e6a 100644 --- a/src/ovirt_host_deploy/constants.py +++ b/src/ovirt_host_deploy/constants.py @@ -104,6 +104,7 @@ OVIRT_NODE = 'VDSM/node' OVIRT_NODE_HAS_OWN_BRIDGES = 'VDSM/nodeHasOwnBridges' CONFIG_OVERRIDE = 'VDSM/configOverride' + DISABLE_NETWORKMANAGER = 'VDSM/disableNetworkManager' CONFIG_PREFIX = 'VDSM_CONFIG/' diff --git a/src/plugins/ovirt-host-deploy/vdsm/packages.py b/src/plugins/ovirt-host-deploy/vdsm/packages.py index 7ae717f..50452ea 100644 --- a/src/plugins/ovirt-host-deploy/vdsm/packages.py +++ b/src/plugins/ovirt-host-deploy/vdsm/packages.py @@ -53,6 +53,10 @@ odeploycons.VdsmEnv.VDSM_MINIMUM_VERSION, None ) + self.environment.setdefault( + odeploycons.VdsmEnv.DISABLE_NETWORKMANAGER, + True + ) @plugin.event( stage=plugin.Stages.STAGE_SETUP, @@ -175,6 +179,18 @@ self.services.state('network', True) self.services.startup('network', True) + # + # remove network manager as it create timing + # issues with the network service and vdsm + # see rhbz#879180 + # + if ( + self.environment[odeploycons.VdsmEnv.DISABLE_NETWORKMANAGER] and + self.services.exists('NetworkManager') + ): + self.services.state('NetworkManager', False) + self.services.startup('NetworkManager', False) + self.services.state('vdsmd', True) -- To view, visit http://gerrit.ovirt.org/17306 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie309c2939f44b3bc2f44eb9e892cbd118651a41a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-host-deploy Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
