x/compass-core
Code Issues Proposed changes

Merge "Load dns_name to all interfaces instead of just mgmt" into dev/experimental

Browse Source
This commit is contained in:
Jenkins 2015-01-15 18:27:40 +00:00 committed by Gerrit Code Review
commit 4419a6d17e
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[$netmask_key] = $val.netmask
#set $rekeyed[$mgmt_key] = $val.is_mgmt #set $rekeyed[$mgmt_key] = $val.is_mgmt
#set $rekeyed[$static_key] = True #set $rekeyed[$static_key] = True
#set dns_key = '-'.join(('dnsname', $nic))
#set $rekeyed[$dns_key] = $dns
#if $val.is_promiscuous: #if $val.is_promiscuous:
#set promic_nic = $nic #set promic_nic = $nic
#end if #end if
#if $val.is_mgmt: #if $val.is_mgmt:
#set mac_key = '-'.join(('macaddress', $nic)) #set mac_key = '-'.join(('macaddress', $nic))
#set dns_key = '-'.join(('dnsname', $nic))
#set $rekeyed[$mac_key] = $mac #set $rekeyed[$mac_key] = $mac
#set $rekeyed[$dns_key] = $dns
#end if #end if
#end for #end for
#set nic_info = json.dumps($rekeyed, encoding='utf-8') #set nic_info = json.dumps($rekeyed, encoding='utf-8')

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

@ -21,15 +21,15 @@
#set $rekeyed[$ip_key] = $val.ip #set $rekeyed[$ip_key] = $val.ip
#set $rekeyed[$netmask_key] = $val.netmask #set $rekeyed[$netmask_key] = $val.netmask
#set $rekeyed[$static_key] = True #set $rekeyed[$static_key] = True
#set dns_key = '-'.join(('dnsname', $nic))
#set $rekeyed[$dns_key] = $dns
#if $val.is_promiscuous: #if $val.is_promiscuous:
#set promic_nic = $nic #set promic_nic = $nic
#end if #end if
#if $val.is_mgmt: #if $val.is_mgmt:
#set mac_key = '-'.join(('macaddress', $nic)) #set mac_key = '-'.join(('macaddress', $nic))
#set dns_key = '-'.join(('dnsname', $nic))
#set $rekeyed[$mac_key] = $mac #set $rekeyed[$mac_key] = $mac
#set $rekeyed[$dns_key] = $dns
#end if #end if
#end for #end for
#set nic_info = json.dumps($rekeyed, encoding='utf-8') #set nic_info = json.dumps($rekeyed, encoding='utf-8')