[node-patches] Change in ovirt-node[ovirt-3.5]: net: Only persist the nic mapping once

[fabiand at redhat.com]

Fabian Deutsch has uploaded a new change for review.

Change subject: net: Only persist the nic mapping once
......................................................................

net: Only persist the nic mapping once

Previously the nic mapping was persisted when the network got
configured. Now we only do this once.

Change-Id: Ifdc208406b930cda5796faafdc804e9ecb1d6bd8
Label: ovirt-3.5-only
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1228043
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M src/ovirt/node/config/defaults.py
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/10/42710/1

diff --git a/src/ovirt/node/config/defaults.py b/src/ovirt/node/config/defaults.py
index ce74862..5ff19e1 100755
--- a/src/ovirt/node/config/defaults.py
+++ b/src/ovirt/node/config/defaults.py
@@ -455,7 +455,8 @@
                 # 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():
+                if File(rulesfile).exists() and \
+                        not File(newrulesfile).exists():
                     process.check_call(["cp", rulesfile, newrulesfile])
                     fs.Config().persist(newrulesfile)
 


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

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