Nir Soffer has uploaded a new change for review. Change subject: multiapth: Remove unsupported getuid_callout option ......................................................................
multiapth: Remove unsupported getuid_callout option This option is not supported since EL 7, and cause a warning when running multipath command line tool. This option was required on EL 6, so we kept it in our configuration to simplify the code. Now that we do not support EL 6, we can remove this and simplify the code. Change-Id: If1059bfe2e803e304c51831a4063d21b2af3abd6 Bug-Url: https://bugzilla.redhat.com/1172186 Signed-off-by: Nir Soffer <[email protected]> --- M lib/vdsm/tool/configurators/multipath.py 1 file changed, 2 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/41/41241/1 diff --git a/lib/vdsm/tool/configurators/multipath.py b/lib/vdsm/tool/configurators/multipath.py index 67651f2..52979db 100644 --- a/lib/vdsm/tool/configurators/multipath.py +++ b/lib/vdsm/tool/configurators/multipath.py @@ -37,8 +37,6 @@ "\n\n" "defaults {\n" " polling_interval 5\n" - " getuid_callout \"%(scsi_id_path)s --whitelisted " - "--replace-whitespace --device=/dev/%%n\"\n" " no_path_retry fail\n" " user_friendly_names no\n" " flush_on_last_del yes\n" @@ -51,8 +49,6 @@ "device {\n" " vendor \"HITACHI\"\n" " product \"DF.*\"\n" - " getuid_callout \"%(scsi_id_path)s --whitelisted " - "--replace-whitespace --device=/dev/%%n\"\n" "}\n" "device {\n" " vendor \"COMPELNT\"\n" @@ -71,8 +67,6 @@ " failback immediate\n" " rr_weight \"uniform\"\n" " # vdsm required configuration\n" - " getuid_callout \"%(scsi_id_path)s --whitelisted " - "--replace-whitespace --device=/dev/%%n\"\n" " features \"0\"\n" " no_path_retry fail\n" "}\n" @@ -97,12 +91,7 @@ _OLD_PRIVATE_TAG = "# RHEV PRIVATE" _MPATH_CONF_PRIVATE_TAG = "# VDSM PRIVATE" -_MPATH_CONF_TEMPLATE = _MPATH_CONF_TAG + _STRG_MPATH_CONF - -_scsi_id = utils.CommandPath("scsi_id", - "/usr/lib/udev/scsi_id", # Fedora - "/lib/udev/scsi_id", # EL6, Ubuntu - ) +_MPATH_CONF_DATA = _MPATH_CONF_TAG + _STRG_MPATH_CONF # If multipathd is up, it will be reloaded after configuration, # or started before vdsm starts, so service should not be stopped @@ -122,8 +111,7 @@ utils.persist(backup) with tempfile.NamedTemporaryFile() as f: - f.write(_MPATH_CONF_TEMPLATE % - {'scsi_id_path': _scsi_id.cmd}) + f.write(_MPATH_CONF_DATA) f.flush() cmd = [constants.EXT_CP, f.name, _MPATH_CONF] -- To view, visit https://gerrit.ovirt.org/41241 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If1059bfe2e803e304c51831a4063d21b2af3abd6 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
