delete the windows newline character

JIRA: COMPASS-7

Change-Id: Iffd549877b8cc50a995bdc59adf1f05c0fcb1d5e
Signed-off-by: baigk <baiguoku@huawei.com>

1 files changed, 32 insertions, 32 deletions

diff --git a/deploy/adapters/cobbler/snippets/preseed_knife.rb b/deploy/adapters/cobbler/snippets/preseed_knife.rb
index 4e9efb21..32047bbc 100644
--- a/deploy/adapters/cobbler/snippets/preseed_knife.rb
+++ b/deploy/adapters/cobbler/snippets/preseed_knife.rb
@@ -1,32 +1,32 @@
-mkdir -p /root/.chef

-cat << EOL > /root/.chef/knife.rb

-log_level        :info

-log_location     '/dev/null'

-#if $getVar('chef_url', '') != ""

-chef_server_url  '$chef_url'

-#end if

-node_name                'admin'

-client_key               '/etc/chef/admin.pem'

-validation_client_name   'chef-validator'

-validation_key           '/etc/chef/validation.pem'

-syntax_check_cache_path  '/root/.chef/syntax_check_cache'

-ssl_verify_mode :verify_none

-EOL

-

-mkdir -p /root/.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 > /root/.chef/trusted_certs/$filename

-            #echo $f.read()

-EOF

-            #silent $f.close() 

-        #end if

-    #end for

-#end if

+mkdir -p /root/.chef
+cat << EOL > /root/.chef/knife.rb
+log_level        :info
+log_location     '/dev/null'
+#if $getVar('chef_url', '') != ""
+chef_server_url  '$chef_url'
+#end if
+node_name                'admin'
+client_key               '/etc/chef/admin.pem'
+validation_client_name   'chef-validator'
+validation_key           '/etc/chef/validation.pem'
+syntax_check_cache_path  '/root/.chef/syntax_check_cache'
+ssl_verify_mode :verify_none
+EOL
+
+mkdir -p /root/.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 > /root/.chef/trusted_certs/$filename
+            #echo $f.read()
+EOF
+            #silent $f.close()
+        #end if
+    #end for
+#end if