From d05b5f04c92034eae1675dc8102247a3cc3315f7 Mon Sep 17 00:00:00 2001
From: baigk <baiguoku@huawei.com>
Date: Tue, 4 Aug 2015 22:21:43 -0400
Subject: delete the windows newline character

JIRA: COMPASS-7

Change-Id: Iffd549877b8cc50a995bdc59adf1f05c0fcb1d5e
Signed-off-by: baigk <baiguoku@huawei.com>
---
 deploy/adapters/cobbler/snippets/preseed_client.rb | 70 +++++++++++-----------
 1 file changed, 35 insertions(+), 35 deletions(-)

(limited to 'deploy/adapters/cobbler/snippets/preseed_client.rb')

diff --git a/deploy/adapters/cobbler/snippets/preseed_client.rb b/deploy/adapters/cobbler/snippets/preseed_client.rb
index 465d96e1..e6c60a4d 100644
--- a/deploy/adapters/cobbler/snippets/preseed_client.rb
+++ b/deploy/adapters/cobbler/snippets/preseed_client.rb
@@ -1,35 +1,35 @@
-cat << EOL > /etc/chef/client.rb
-log_level        :info
-log_location     '/dev/null'
-#if $getVar('chef_url', '') != ""
-chef_server_url  '$chef_url'
-#elif $getVar("compass_server","") != ""
-chef_server_url  'https://$compass_server'
-#else
-chef_server_url  'https://$server'
-#end if
-validation_client_name 'chef-validator'
-json_attribs nil
-pid_file '/var/run/chef-client.pid'
-# Using default node name (fqdn) 
-no_lazy_load true
-ssl_verify_mode :verify_none
-EOL
-
-mkdir -p /etc/chef/trusted_certs
-#set certs_path = $getVar("trusted_certs_path", "/var/opt/chef-server/nginx/ca")
-#if $certs_path != ""
-    #import os
-    #import os.path
-    #set filenames = $os.listdir($certs_path)
-    #for filename in $filenames
-        #if $filename.endswith('.crt')
-            #set filepath = $os.path.join($certs_path, $filename)
-            #set f = $open($filepath)
-cat << EOF > /etc/chef/trusted_certs/$filename
-            #echo $f.read()
-EOF
-            #silent $f.close() 
-        #end if
-    #end for
-#end if
+cat << EOL > /etc/chef/client.rb
+log_level        :info
+log_location     '/dev/null'
+#if $getVar('chef_url', '') != ""
+chef_server_url  '$chef_url'
+#elif $getVar("compass_server","") != ""
+chef_server_url  'https://$compass_server'
+#else
+chef_server_url  'https://$server'
+#end if
+validation_client_name 'chef-validator'
+json_attribs nil
+pid_file '/var/run/chef-client.pid'
+# Using default node name (fqdn)
+no_lazy_load true
+ssl_verify_mode :verify_none
+EOL
+
+mkdir -p /etc/chef/trusted_certs
+#set certs_path = $getVar("trusted_certs_path", "/var/opt/chef-server/nginx/ca")
+#if $certs_path != ""
+    #import os
+    #import os.path
+    #set filenames = $os.listdir($certs_path)
+    #for filename in $filenames
+        #if $filename.endswith('.crt')
+            #set filepath = $os.path.join($certs_path, $filename)
+            #set f = $open($filepath)
+cat << EOF > /etc/chef/trusted_certs/$filename
+            #echo $f.read()
+EOF
+            #silent $f.close()
+        #end if
+    #end for
+#end if
-- 
cgit 1.2.3-korg