add default nameserver8.8.8.8 and set chef dns to deployed nodes
Change-Id: I2178a88c0a85d55261f414c78daf73328b07de01
This commit is contained in:
parent
02abf1a5e8
commit
afc8b44162
@ -4,9 +4,12 @@ cat << EOL > /etc/hosts
|
|||||||
#for $iname, $idata in $interfaces.items()
|
#for $iname, $idata in $interfaces.items()
|
||||||
#if $hostname and $idata["management"] and $idata["static"] and $idata.get("ip_address", "") != ""
|
#if $hostname and $idata["management"] and $idata["static"] and $idata.get("ip_address", "") != ""
|
||||||
$idata["ip_address"] $hostname
|
$idata["ip_address"] $hostname
|
||||||
#end if
|
#end if
|
||||||
#end for
|
#end for
|
||||||
#import os
|
#import os
|
||||||
#set $server_name = $os.uname[1]
|
#set $server_name = $os.uname[1]
|
||||||
$server $server_name
|
$server $server_name
|
||||||
|
#if $getVar("chef_server_ip", "") != "" and $getVar("chef_server_dns", "") != ""
|
||||||
|
$chef_server_ip $chef_server_dns
|
||||||
|
#end if
|
||||||
EOL
|
EOL
|
||||||
|
@ -331,6 +331,9 @@ sed -i -e "/^nameserver /d" /etc/resolv.conf
|
|||||||
echo "nameserver $nameserver" >>/etc/resolv.conf
|
echo "nameserver $nameserver" >>/etc/resolv.conf
|
||||||
#end for
|
#end for
|
||||||
#end if
|
#end if
|
||||||
|
#if '8.8.8.8' not in $name_servers
|
||||||
|
echo "nameserver 8.8.8.8" >>/etc/resolv.conf
|
||||||
|
#end if
|
||||||
|
|
||||||
## Disable all eth interfaces by default before overwriting
|
## Disable all eth interfaces by default before overwriting
|
||||||
## the old files with the new ones in the working directory
|
## the old files with the new ones in the working directory
|
||||||
|
@ -1,10 +1,14 @@
|
|||||||
echo "127.0.0.1 $system_name localhost localhost.localdomain localhost4 localhost4.localdomain4" > /target/etc/hosts; \
|
echo "127.0.0.1 $system_name localhost localhost.localdomain localhost4 localhost4.localdomain4" > /target/etc/hosts; \
|
||||||
echo "::1 $system_name localhost localhost.localdomain localhost6 localhost6.localdomain6" >> /target/etc/hosts; \
|
echo "::1 $system_name localhost localhost.localdomain localhost6 localhost6.localdomain6" >> /target/etc/hosts; \
|
||||||
#for $iname, $idata in $interfaces.items()
|
#for $iname, $idata in $interfaces.items()
|
||||||
#if $hostname and $idata["management"] and $idata["static"] and $idata.get("ip_address", "") != ""
|
#if $hostname and $idata["management"] and $idata["static"] and $idata.get("ip_address", "") != ""
|
||||||
echo "$idata["ip_address"] $hostname" >> /target/etc/hosts; \
|
echo "$idata["ip_address"] $hostname" >> /target/etc/hosts; \
|
||||||
#end if
|
#end if
|
||||||
#end for
|
#end for
|
||||||
#import os
|
#import os
|
||||||
#set $server_name = $os.uname[1]
|
#set $server_name = $os.uname[1]
|
||||||
echo "$server $server_name" >> /target/etc/hosts; \
|
echo "$server $server_name" >> /target/etc/hosts; \
|
||||||
|
|
||||||
|
#if $getVar("chef_server_ip", "") != "" and $getVar("chef_server_dns", "") != ""
|
||||||
|
echo "$chef_server_ip $chef_server_dns" >> /target/etc/hosts; \
|
||||||
|
#end if
|
||||||
|
@ -187,6 +187,9 @@ echo " gateway $gateway" >> /target/etc/network/interfaces; \
|
|||||||
## =============================================================================
|
## =============================================================================
|
||||||
## Configure name server search path in /target/etc/resolv.conf
|
## Configure name server search path in /target/etc/resolv.conf
|
||||||
#set $nameservers = ' '.join($name_servers)
|
#set $nameservers = ' '.join($name_servers)
|
||||||
|
#if '8.8.8.8' not in $name_servers
|
||||||
|
#set $nameservers = ' '.join(($nameservers, '8.8.8.8'))
|
||||||
|
#end if
|
||||||
#set $nameserver_search = ' '.join($name_servers_search)
|
#set $nameserver_search = ' '.join($name_servers_search)
|
||||||
#if $nameservers != ""
|
#if $nameservers != ""
|
||||||
echo " dns-nameservers $nameservers" >> /target/etc/network/interfaces; \
|
echo " dns-nameservers $nameservers" >> /target/etc/network/interfaces; \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user