x/compass-core
Code Issues Proposed changes

Load dns_name to all interfaces instead of just mgmt

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

Change-Id: I3e1e1275f1227b458424275d57c7789230daef63
This commit is contained in:
Xicheng Chang 2015-01-02 11:35:17 -08:00
parent acba93ec1c
commit 53567439ca
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/templates/cobbler/CentOS-6.5-x86_64/system.tmpl
View File

@ -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')

4
conf/templates/cobbler/Ubuntu-12.04-x86_64/system.tmpl
View File

@ -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')