From b327ac4bad4b97cfff26fcabff1eb959b897472c Mon Sep 17 00:00:00 2001 From: xiaodongwang Date: Mon, 6 Oct 2014 17:30:47 -0700 Subject: [PATCH] do not set no_proxy if http_proxy is not set Change-Id: Id8e0bbed0699d73eaf42778cf5295afd8f0af6b9 --- cobbler/snippets/kickstart_client.rb | 5 +++-- cobbler/snippets/preseed_client.rb | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cobbler/snippets/kickstart_client.rb b/cobbler/snippets/kickstart_client.rb index ef6e2d6..314a47f 100644 --- a/cobbler/snippets/kickstart_client.rb +++ b/cobbler/snippets/kickstart_client.rb @@ -11,11 +11,12 @@ ENV['http_proxy'] = '$proxy' ENV['https_proxy'] = '$proxy' ENV['HTTP_PROXY'] = '$proxy' ENV['HTTPS_PROXY'] = '$proxy' -#end if -#if $getVar('ignore_proxy', '') != "" + #if $getVar('ignore_proxy', '') != "" + #set ignore_proxy = ','.join([proxy.strip() for proxy in $ignore_proxy.split(',') if proxy.strip()]) no_proxy '$ignore_proxy' ENV['no_proxy'] = '$ignore_proxy' ENV['NO_PROXY'] = '$ignore_proxy' + #end if #end if validation_client_name 'chef-validator' json_attribs nil diff --git a/cobbler/snippets/preseed_client.rb b/cobbler/snippets/preseed_client.rb index 6afebec..a900ba4 100644 --- a/cobbler/snippets/preseed_client.rb +++ b/cobbler/snippets/preseed_client.rb @@ -10,11 +10,12 @@ echo "ENV['http_proxy'] = '$proxy'" >> /target/etc/chef/client.rb; \ echo "ENV['https_proxy'] = '$proxy'" >> /target/etc/chef/client.rb; \ echo "ENV['HTTP_PROXY'] = '$proxy'" >> /target/etc/chef/client.rb; \ echo "ENV['HTTPS_PROXY'] = '$proxy'" >> /target/etc/chef/client.rb; \ -#end if -#if $getVar('ignore_proxy', '') != "" + #if $getVar('ignore_proxy', '') != "" + #set ignore_proxy = ','.join([proxy.strip() for proxy in $ignore_proxy.split(',') if proxy.strip()]) echo "no_proxy '$ignore_proxy'" >> /target/etc/chef/client.rb; \ echo "ENV['no_proxy'] = '$ignore_proxy'" >> /target/etc/chef/client.rb; \ echo "ENV['NO_PROXY'] = '$ignore_proxy'" >> /target/etc/chef/client.rb; \ + #end if #end if #if $getVar('chef_node_name', '') != "" echo "node_name '$chef_node_name'" >> /target/etc/chef/client.rb; \