[node-patches] Change in ovirt-node[master]: network: Set PEERDNS=no if nameservers are given

[fabiand at fedoraproject.org]

Fabian Deutsch has uploaded a new change for review.

Change subject: network: Set PEERDNS=no if nameservers are given
......................................................................

network: Set PEERDNS=no if nameservers are given

Previosuly existing nameservers were overwritten when an unconfigured
NIC got configured.
Now the PEERDNS key is used to prevent overwriting existing nameservers.

rhbz#830691

Change-Id: If00891ac423baac2753c186195504ba20602b801
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M scripts/ovirtnode/network.py
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/81/7981/1

diff --git a/scripts/ovirtnode/network.py b/scripts/ovirtnode/network.py
index e503c27..6e21f9c 100644
--- a/scripts/ovirtnode/network.py
+++ b/scripts/ovirtnode/network.py
@@ -87,6 +87,12 @@
         self.BR_CONFIG += "set %s/TYPE Bridge\n" % BR_ROOT
         self.BR_CONFIG += "set %s/PEERNTP yes\n" % BR_ROOT
         self.BR_CONFIG += "set %s/DELAY 0\n" % BR_ROOT
+
+        if "OVIRT_DNS" in OVIRT_VARS:
+            if OVIRT_VARS["OVIRT_DNS"]:
+                self.IF_CONFIG += "set %s/PEERDNS no\n" % IF_ROOT
+                self.BR_CONFIG += "set %s/PEERDNS no\n" % BR_ROOT
+
         if "OVIRT_IPV6" in OVIRT_VARS:
             if OVIRT_VARS["OVIRT_IPV6"] == "auto":
                 self.BR_CONFIG += "set %s/IPV6INIT yes\n" % BR_ROOT


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If00891ac423baac2753c186195504ba20602b801
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at fedoraproject.org>