[node-patches] Change in ovirt-node[ovirt-3.5]: spec/recipe: Only update mpath.conf once

[fabiand at redhat.com]

Fabian Deutsch has uploaded a new change for review.

Change subject: spec/recipe: Only update mpath.conf once
......................................................................

spec/recipe: Only update mpath.conf once

Previously we updated multipath.conf in the spec and in the recipe, this
lead to a situation where we created an invalid conf.
Which implied that multipath did not work at all.
Now the file is only modified in the recipe.

Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1152948
Change-Id: I3fdb8d0061310144c09280a374d8bc0c1a53b3cd
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
(cherry picked from commit dcde4b6bc95c96d6c90897f9b45646a2770a2f45)
---
M ovirt-node.spec.in
M recipe/rhevh6-post.ks
2 files changed, 2 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/74/36074/1

diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index a8be2f6..788c529 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -565,19 +565,6 @@
 patch -d /usr/share/dracut/ -p0 < %{app_root}/dracut-7ed4ff0636c74a2f819ad6e4f2ab4862.patch
 
 %endif
-#use all hard-coded defaults for multipath
-# except for getuid_callout where we need to replace-whitespace on EL6
-%if %{is_el6}
-cat > /etc/multipath.conf << \EOF_multipath_conf
-defaults {
-    getuid_callout "/lib/udev/scsi_id --replace-whitespace --whitelisted --device=/dev/%n"
-}
-EOF_multipath_conf
-%else
-cat > /etc/multipath.conf << \EOF_multipath_conf2
-#Use Defaults
-EOF_multipath_conf2
-%endif
 
 #Disable X11Forwarding for sshd
 sed -i -e 's/X11Forwarding yes/X11Forwarding no/' /etc/ssh/sshd_config
diff --git a/recipe/rhevh6-post.ks b/recipe/rhevh6-post.ks
index 73e0b73..8655a59 100644
--- a/recipe/rhevh6-post.ks
+++ b/recipe/rhevh6-post.ks
@@ -245,6 +245,7 @@
 cat << \EOF_mpath >> /etc/multipath.conf
 
 defaults {
-        find_multipaths yes
+    find_multipaths yes
+    getuid_callout "/lib/udev/scsi_id --replace-whitespace --whitelisted --device=/dev/%n"
 }
 EOF_mpath


-- 
To view, visit http://gerrit.ovirt.org/36074
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3fdb8d0061310144c09280a374d8bc0c1a53b3cd
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Fabian Deutsch <fabiand at redhat.com>