From 6e1738ee9b52467eea6e21898c868e9798f71ef2 Mon Sep 17 00:00:00 2001 From: xiaodongwang Date: Wed, 1 Apr 2015 16:04:36 -0700 Subject: [PATCH] dd unique dns name for all no management interfaces Change-Id: Ibb86af89ce542e236aaf58dd6120f29420c324b9 --- conf/templates/cobbler/CentOS-6.5-x86_64/system.tmpl | 7 ++++++- conf/templates/cobbler/CentOS-6.6-x86_64/system.tmpl | 9 +++++++-- conf/templates/cobbler/CentOS-7.0-x86_64/system.tmpl | 9 +++++++-- conf/templates/cobbler/Ubuntu-12.04-x86_64/system.tmpl | 7 ++++++- conf/templates/cobbler/Ubuntu-14.04-x86_64/system.tmpl | 9 +++++++-- conf/templates/cobbler/sles-11sp3-x86_64/system.tmpl | 7 ++++++- 6 files changed, 39 insertions(+), 9 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 3768ccfd..34c9c5e3 100644 --- a/conf/templates/cobbler/CentOS-6.5-x86_64/system.tmpl +++ b/conf/templates/cobbler/CentOS-6.5-x86_64/system.tmpl @@ -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 diff --git a/conf/templates/cobbler/CentOS-6.6-x86_64/system.tmpl b/conf/templates/cobbler/CentOS-6.6-x86_64/system.tmpl index 3db5e350..34c9c5e3 100644 --- a/conf/templates/cobbler/CentOS-6.6-x86_64/system.tmpl +++ b/conf/templates/cobbler/CentOS-6.6-x86_64/system.tmpl @@ -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') diff --git a/conf/templates/cobbler/CentOS-7.0-x86_64/system.tmpl b/conf/templates/cobbler/CentOS-7.0-x86_64/system.tmpl index 3db5e350..34c9c5e3 100644 --- a/conf/templates/cobbler/CentOS-7.0-x86_64/system.tmpl +++ b/conf/templates/cobbler/CentOS-7.0-x86_64/system.tmpl @@ -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') 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 aa3b02a7..2d7f1432 100644 --- a/conf/templates/cobbler/Ubuntu-12.04-x86_64/system.tmpl +++ b/conf/templates/cobbler/Ubuntu-12.04-x86_64/system.tmpl @@ -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 diff --git a/conf/templates/cobbler/Ubuntu-14.04-x86_64/system.tmpl b/conf/templates/cobbler/Ubuntu-14.04-x86_64/system.tmpl index a7c12cb4..2d7f1432 100644 --- a/conf/templates/cobbler/Ubuntu-14.04-x86_64/system.tmpl +++ b/conf/templates/cobbler/Ubuntu-14.04-x86_64/system.tmpl @@ -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') diff --git a/conf/templates/cobbler/sles-11sp3-x86_64/system.tmpl b/conf/templates/cobbler/sles-11sp3-x86_64/system.tmpl index 3768ccfd..34c9c5e3 100644 --- a/conf/templates/cobbler/sles-11sp3-x86_64/system.tmpl +++ b/conf/templates/cobbler/sles-11sp3-x86_64/system.tmpl @@ -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