[node-patches] Change in ovirt-node[master]: Remove persistent net-naming hack

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: Remove persistent net-naming hack
......................................................................

Remove persistent net-naming hack

But keep it for EL6.

Change-Id: I543622fe94d1468602d9e86a375b80ea5306ebc0
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=910701
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M scripts/ovirt-init-functions.sh.in
M src/ovirt/node/config/defaults.py
2 files changed, 9 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/36/30936/1

diff --git a/scripts/ovirt-init-functions.sh.in b/scripts/ovirt-init-functions.sh.in
index 49cc2dc..5a84aa7 100644
--- a/scripts/ovirt-init-functions.sh.in
+++ b/scripts/ovirt-init-functions.sh.in
@@ -908,10 +908,12 @@
     fi
 
     [[ -f "/etc/udev/rules.d/71-persistent-node-net.rules" ]] && {
-        # Rename the interfaces after bind-mounting the udev rules, rhbz#831658
-        rm -f /etc/udev/rules.d/70-persistent-net.rules
-        udevadm control --reload-rules
-        udevadm trigger --action=add --subsystem-match=net
+        [[ $(rpm -E "%{?rhel"}) = 6 ]] || [[ $(rpm -E "%{?centos}") = 6 ]] && {
+            # Rename the interfaces after bind-mounting the udev rules, rhbz#831658
+            rm -f /etc/udev/rules.d/70-persistent-net.rules
+            udevadm control --reload-rules
+            udevadm trigger --action=add --subsystem-match=net
+        }
     }
 
     if [ -n "$adminpw" ]; then
diff --git a/src/ovirt/node/config/defaults.py b/src/ovirt/node/config/defaults.py
index 7da88b7..362df33 100644
--- a/src/ovirt/node/config/defaults.py
+++ b/src/ovirt/node/config/defaults.py
@@ -452,7 +452,9 @@
         tx.append(StopNetworkServices())
         tx.append(RemoveConfiguration())
         tx.append(WriteConfiguration())
-        tx.append(PersistMacNicMapping())
+        if system.is_python_2_6():
+            # Running EL6 -- persist network renaming
+            tx.append(PersistMacNicMapping())
         tx.append(StartNetworkServices())
         return tx
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I543622fe94d1468602d9e86a375b80ea5306ebc0
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Ryan Barry <rbarry at redhat.com>