[node-patches] Change in ovirt-node[master]: network. Remove udev rules hack

[fabiand at redhat.com]

Fabian Deutsch has uploaded a new change for review.

Change subject: network. Remove udev rules hack
......................................................................

network. Remove udev rules hack

The hack was used for persisting device names.

Change-Id: I2edaf7acbe7150c945e778ee52563c37b4bd0775
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M scripts/ovirt-init-functions.sh.in
M src/ovirt/node/config/defaults.py
2 files changed, 0 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/87/42387/1

diff --git a/scripts/ovirt-init-functions.sh.in b/scripts/ovirt-init-functions.sh.in
index dc7e8ed..63ab652 100644
--- a/scripts/ovirt-init-functions.sh.in
+++ b/scripts/ovirt-init-functions.sh.in
@@ -940,15 +940,6 @@
     fi
 
 
-    [[ -f "/etc/udev/rules.d/71-persistent-node-net.rules" ]] && {
-        [[ $(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
         log "Setting temporary admin password"
         unmount_config /etc/passwd /etc/shadow
diff --git a/src/ovirt/node/config/defaults.py b/src/ovirt/node/config/defaults.py
index a078438..c6ec7cd 100755
--- a/src/ovirt/node/config/defaults.py
+++ b/src/ovirt/node/config/defaults.py
@@ -448,18 +448,6 @@
                                               m_ipv6["netmask"])
                     cfg.ipv6_defaultgw = m_ipv6["gateway"]
 
-        class PersistMacNicMapping(utils.Transaction.Element):
-            title = "Persist MAC-NIC Mappings"
-
-            def commit(self):
-                # Copy the initial net rules to a file that get's not
-                # overwritten at each boot, rhbz#773495
-                rulesfile = "/etc/udev/rules.d/70-persistent-net.rules"
-                newrulesfile = "/etc/udev/rules.d/71-persistent-node-net.rules"
-                if File(rulesfile).exists():
-                    process.check_call(["cp", rulesfile, newrulesfile])
-                    fs.Config().persist(newrulesfile)
-
         class StartNetworkServices(utils.Transaction.Element):
             title = "Start network services"
 
@@ -472,9 +460,6 @@
         tx.append(StopNetworkServices())
         tx.append(RemoveConfiguration())
         tx.append(WriteConfiguration())
-        if system.is_max_el(6):
-            # Running EL6 -- persist network renaming
-            tx.append(PersistMacNicMapping())
         tx.append(StartNetworkServices())
         return tx
 


-- 
To view, visit https://gerrit.ovirt.org/42387
To unsubscribe, visit https://gerrit.ovirt.org/settings

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