x/compass-core
Code Issues Proposed changes

dd unique dns name for all no management interfaces

Browse Source 
Change-Id: Ibb86af89ce542e236aaf58dd6120f29420c324b9
This commit is contained in:
xiaodongwang
2015-04-01 16:04:36 -07:00
parent 8c68fb6f4c
commit 6e1738ee9b
6 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,8 +22,13 @@
#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_mgmt
#set $rekeyed[$dns_key] = $dns
#else
#set $rekeyed[$dns_key] = '-'.join(($dns, $nic))
#end if
#if $val.is_promiscuous:
#set promic_nic = $nic

9
conf/templates/cobbler/CentOS-6.6-x86_64/system.tmpl
View File

@@ -23,14 +23,19 @@
#set $rekeyed[$mgmt_key] = $val.is_mgmt
#set $rekeyed[$static_key] = True
#set dns_key = '-'.join(('dnsname', $nic))
#if $val.is_mgmt
#set $rekeyed[$dns_key] = $dns
#else
#set $rekeyed[$dns_key] = '-'.join(($dns, $nic))
#end if
#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')

9
conf/templates/cobbler/CentOS-7.0-x86_64/system.tmpl
View File

@@ -23,14 +23,19 @@
#set $rekeyed[$mgmt_key] = $val.is_mgmt
#set $rekeyed[$static_key] = True
#set dns_key = '-'.join(('dnsname', $nic))
#if $val.is_mgmt
#set $rekeyed[$dns_key] = $dns
#else
#set $rekeyed[$dns_key] = '-'.join(($dns, $nic))
#end if
#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')

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

@@ -21,8 +21,13 @@
#set $rekeyed[$ip_key] = $val.ip
#set $rekeyed[$netmask_key] = $val.netmask
#set $rekeyed[$static_key] = True
#set dns_key = '-'.join(('dnsname', $nic))
#set $rekeyed[$dns_key] = $dns
#if $val.is_mgmt
#set $rekeyed[$dns_key] = $dns
#else
#set $rekeyed[$dns_key] = '-'.join(($dns, $nic))
#end if
#if $val.is_promiscuous:
#set promic_nic = $nic

9
conf/templates/cobbler/Ubuntu-14.04-x86_64/system.tmpl
View File

@@ -22,14 +22,19 @@
#set $rekeyed[$netmask_key] = $val.netmask
#set $rekeyed[$static_key] = True
#set dns_key = '-'.join(('dnsname', $nic))
#if $val.is_mgmt
#set $rekeyed[$dns_key] = $dns
#else
#set $rekeyed[$dns_key] = '-'.join(($dns, $nic))
#end if
#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')

7
conf/templates/cobbler/sles-11sp3-x86_64/system.tmpl
View File

@@ -22,8 +22,13 @@
#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_mgmt
#set $rekeyed[$dns_key] = $dns
#else
#set $rekeyed[$dns_key] = '-'.join(($dns, $nic))
#end if
#if $val.is_promiscuous:
#set promic_nic = $nic