From 53567439ca3c472e26ce953002398df30f0b1349 Mon Sep 17 00:00:00 2001
From: Xicheng Chang <xichengchang@huawei.com>
Date: Fri, 2 Jan 2015 11:35:17 -0800
Subject: [PATCH] Load dns_name to all interfaces instead of just mgmt

Otherwise, cobbler would fail if dns_name is just set in mgmt interface
Closes-bug: #1407146

Change-Id: I3e1e1275f1227b458424275d57c7789230daef63
---
 conf/templates/cobbler/CentOS-6.5-x86_64/system.tmpl   | 4 ++--
 conf/templates/cobbler/Ubuntu-12.04-x86_64/system.tmpl | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/templates/cobbler/CentOS-6.5-x86_64/system.tmpl b/conf/templates/cobbler/CentOS-6.5-x86_64/system.tmpl
index 3db5e350..3768ccfd 100644
--- a/conf/templates/cobbler/CentOS-6.5-x86_64/system.tmpl
+++ b/conf/templates/cobbler/CentOS-6.5-x86_64/system.tmpl
@@ -22,15 +22,15 @@
             #set $rekeyed[$netmask_key] = $val.netmask
             #set $rekeyed[$mgmt_key] = $val.is_mgmt
             #set $rekeyed[$static_key] = True
+            #set dns_key = '-'.join(('dnsname', $nic))
+            #set $rekeyed[$dns_key] = $dns
 
             #if $val.is_promiscuous:
                 #set promic_nic = $nic
             #end if
             #if $val.is_mgmt:
                 #set mac_key = '-'.join(('macaddress', $nic))
-                #set dns_key = '-'.join(('dnsname', $nic))
                 #set $rekeyed[$mac_key] = $mac
-                #set $rekeyed[$dns_key] = $dns
             #end if
         #end for
         #set nic_info = json.dumps($rekeyed, encoding='utf-8')
diff --git a/conf/templates/cobbler/Ubuntu-12.04-x86_64/system.tmpl b/conf/templates/cobbler/Ubuntu-12.04-x86_64/system.tmpl
index 3db5e350..3768ccfd 100644
--- a/conf/templates/cobbler/Ubuntu-12.04-x86_64/system.tmpl
+++ b/conf/templates/cobbler/Ubuntu-12.04-x86_64/system.tmpl
@@ -22,15 +22,15 @@
             #set $rekeyed[$netmask_key] = $val.netmask
             #set $rekeyed[$mgmt_key] = $val.is_mgmt
             #set $rekeyed[$static_key] = True
+            #set dns_key = '-'.join(('dnsname', $nic))
+            #set $rekeyed[$dns_key] = $dns
 
             #if $val.is_promiscuous:
                 #set promic_nic = $nic
             #end if
             #if $val.is_mgmt:
                 #set mac_key = '-'.join(('macaddress', $nic))
-                #set dns_key = '-'.join(('dnsname', $nic))
                 #set $rekeyed[$mac_key] = $mac
-                #set $rekeyed[$dns_key] = $dns
             #end if
         #end for
         #set nic_info = json.dumps($rekeyed, encoding='utf-8')