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/networking.xml | 262 ++++++++++++------------
 1 file changed, 131 insertions(+), 131 deletions(-)

(limited to 'deploy/adapters/cobbler/snippets/networking.xml')

diff --git a/deploy/adapters/cobbler/snippets/networking.xml b/deploy/adapters/cobbler/snippets/networking.xml
index a468ab47..c9428a48 100644
--- a/deploy/adapters/cobbler/snippets/networking.xml
+++ b/deploy/adapters/cobbler/snippets/networking.xml
@@ -1,131 +1,131 @@
-#set $hostname = $getVar("hostname","")
-#if $hostname == ""
-#set $hostname = $getVar("system_name","cobbler")
-#end if
-#if $getVar("dns_name_eth0","") != ""
-	#set $my_hostname = $hostname.split('.',1)[:1][0]
-	#set $my_domainname = $dns_name_eth0.split('.',1)[1:][0]
-#else
-	#set $my_hostname = $hostname
-	#set $my_domainname = "site"
-#end if
-
-  <networking>
-    <keep_install_network config:type="boolean">false</keep_install_network>
-    <dhcp_options>
-      <dhclient_client_id></dhclient_client_id>
-      <dhclient_hostname_option></dhclient_hostname_option>
-    </dhcp_options>
-    <dns>
-      <dhcp_hostname config:type="boolean">false</dhcp_hostname>
-      <dhcp_resolv config:type="boolean">false</dhcp_resolv>
-      <write_hostname config:type="boolean">false</write_hostname>
-      <resolv_conf_policy></resolv_conf_policy>
-      <hostname>$my_hostname</hostname>
-      <domain>$my_domainname</domain>
-      #if $getVar("name_servers_search","") != ""
-      <searchlist config:type="list">
-      #for $sd in $name_servers_search
-        <search>$sd</search>
-      #end for
-      </searchlist>
-      #end if
-      <nameservers config:type="list">
-      #for $ns in $name_servers
-        <nameserver>$ns</nameserver>
-      #end for
-      </nameservers>
-    </dns>
-    <interfaces config:type="list">
-    #if $getVar("system_name","") != ""
-    #set $ikeys = $interfaces.keys()
-    #for $iface in $ikeys
-      #set $idata         = $interfaces[$iface]
-      #set $mac           = $idata["mac_address"]
-      #set $ip            = $idata["ip_address"]
-      #set $netmask       = $idata["netmask"]
-      #set $iface_type    = $idata["interface_type"]
-      #set $bonding_opts  = $idata["bonding_opts"]
-      #if $iface_type.lower() == "bond"
-      <interface>
-        <bonding_master>yes</bonding_master>
-        <bonding_module_opts>$bonding_opts.lower()</bonding_module_opts>
-        #set $loop_ikeys = $interfaces.keys()
-        #set $loop_counter = 0
-        #for $loop_iface in $loop_ikeys
-          #set $loop_idata          = $interfaces[$loop_iface]
-          #set $loop_interface_type = $loop_idata["interface_type"]
-          #if $loop_interface_type.lower == "bond_slave"
-             #if $loop_idata["interface_master"] != ""
-                #if $loop_idata["interface_master"].lower() == $iface.lower()
-                   <bonding_slave$loop_counter>$loop_iface</bonding_slave$loop_counter>
-                   #set $loop_counter += 1
-                #end if
-             #end if
-          #end if
-        #end for
-        <bootproto>static</bootproto>
-        <device>$iface</device>
-        <ipaddr>$ip</ipaddr>
-        <netmask>$netmask</netmask>
-        <startmode>auto</startmode>
-        <usercontrol>no</usercontrol>
-      </interface>
-      #end if
-      #if $iface_type.lower() in ["bond_slave","bridge_slave"]
-      <interface>
-        <bootproto>none</bootproto>
-        <device>$iface</device>
-        <startmode>off</startmode>
-        <usercontrol>no</usercontrol>
-      </interface>
-      #end if
-      #if $iface_type.lower() in ["","na"]
-      <interface>
-        <bootproto>static</bootproto>
-        <device>$iface</device>
-        <lladdr>$mac.lower()</lladdr>
-        <ipaddr>$ip</ipaddr>
-        <netmask>$netmask</netmask>
-        <startmode>auto</startmode>
-        <usercontrol>no</usercontrol>
-      </interface>
-      #end if
-    #end for
-    #end if
-    </interfaces>
-    <managed config:type="boolean">false</managed>
-    <net-udev config:type="list">
-    #if $getVar("system_name","") != ""
-    #set $ikeys = $interfaces.keys()
-    #for $iface in $ikeys
-      #set $idata = $interfaces[$iface]
-      #set $mac            = $idata["mac_address"]
-      #set $interface_type = $idata["interface_type"]
-      #if $mac.lower() != ""
-      #if $interface_type.lower() not in ["bond","bridge"]
-      <rule>
-        <name>$iface</name>
-        <rule>ATTR{address}</rule>
-        <value>$mac.lower()</value>
-      </rule>
-      #end if
-      #end if
-    #end for
-    #end if
-    </net-udev>
-    <routing>
-      <ip_forward config:type="boolean">false</ip_forward>
-      #if $getVar("system_name","") != ""
-      ## TODO: add in static routes here
-      <routes config:type="list">
-        <route>
-          <destination>default</destination>
-          <netmask>-</netmask>
-          <device>-</device>
-          <gateway>$gateway</gateway>
-        </route>
-      </routes>
-      #end if
-    </routing>
-  </networking>
+#set $hostname = $getVar("hostname","")
+#if $hostname == ""
+#set $hostname = $getVar("system_name","cobbler")
+#end if
+#if $getVar("dns_name_eth0","") != ""
+    #set $my_hostname = $hostname.split('.',1)[:1][0]
+    #set $my_domainname = $dns_name_eth0.split('.',1)[1:][0]
+#else
+    #set $my_hostname = $hostname
+    #set $my_domainname = "site"
+#end if
+
+  <networking>
+    <keep_install_network config:type="boolean">false</keep_install_network>
+    <dhcp_options>
+      <dhclient_client_id></dhclient_client_id>
+      <dhclient_hostname_option></dhclient_hostname_option>
+    </dhcp_options>
+    <dns>
+      <dhcp_hostname config:type="boolean">false</dhcp_hostname>
+      <dhcp_resolv config:type="boolean">false</dhcp_resolv>
+      <write_hostname config:type="boolean">false</write_hostname>
+      <resolv_conf_policy></resolv_conf_policy>
+      <hostname>$my_hostname</hostname>
+      <domain>$my_domainname</domain>
+      #if $getVar("name_servers_search","") != ""
+      <searchlist config:type="list">
+      #for $sd in $name_servers_search
+        <search>$sd</search>
+      #end for
+      </searchlist>
+      #end if
+      <nameservers config:type="list">
+      #for $ns in $name_servers
+        <nameserver>$ns</nameserver>
+      #end for
+      </nameservers>
+    </dns>
+    <interfaces config:type="list">
+    #if $getVar("system_name","") != ""
+    #set $ikeys = $interfaces.keys()
+    #for $iface in $ikeys
+      #set $idata         = $interfaces[$iface]
+      #set $mac           = $idata["mac_address"]
+      #set $ip            = $idata["ip_address"]
+      #set $netmask       = $idata["netmask"]
+      #set $iface_type    = $idata["interface_type"]
+      #set $bonding_opts  = $idata["bonding_opts"]
+      #if $iface_type.lower() == "bond"
+      <interface>
+        <bonding_master>yes</bonding_master>
+        <bonding_module_opts>$bonding_opts.lower()</bonding_module_opts>
+        #set $loop_ikeys = $interfaces.keys()
+        #set $loop_counter = 0
+        #for $loop_iface in $loop_ikeys
+          #set $loop_idata          = $interfaces[$loop_iface]
+          #set $loop_interface_type = $loop_idata["interface_type"]
+          #if $loop_interface_type.lower == "bond_slave"
+             #if $loop_idata["interface_master"] != ""
+                #if $loop_idata["interface_master"].lower() == $iface.lower()
+                   <bonding_slave$loop_counter>$loop_iface</bonding_slave$loop_counter>
+                   #set $loop_counter += 1
+                #end if
+             #end if
+          #end if
+        #end for
+        <bootproto>static</bootproto>
+        <device>$iface</device>
+        <ipaddr>$ip</ipaddr>
+        <netmask>$netmask</netmask>
+        <startmode>auto</startmode>
+        <usercontrol>no</usercontrol>
+      </interface>
+      #end if
+      #if $iface_type.lower() in ["bond_slave","bridge_slave"]
+      <interface>
+        <bootproto>none</bootproto>
+        <device>$iface</device>
+        <startmode>off</startmode>
+        <usercontrol>no</usercontrol>
+      </interface>
+      #end if
+      #if $iface_type.lower() in ["","na"]
+      <interface>
+        <bootproto>static</bootproto>
+        <device>$iface</device>
+        <lladdr>$mac.lower()</lladdr>
+        <ipaddr>$ip</ipaddr>
+        <netmask>$netmask</netmask>
+        <startmode>auto</startmode>
+        <usercontrol>no</usercontrol>
+      </interface>
+      #end if
+    #end for
+    #end if
+    </interfaces>
+    <managed config:type="boolean">false</managed>
+    <net-udev config:type="list">
+    #if $getVar("system_name","") != ""
+    #set $ikeys = $interfaces.keys()
+    #for $iface in $ikeys
+      #set $idata = $interfaces[$iface]
+      #set $mac            = $idata["mac_address"]
+      #set $interface_type = $idata["interface_type"]
+      #if $mac.lower() != ""
+      #if $interface_type.lower() not in ["bond","bridge"]
+      <rule>
+        <name>$iface</name>
+        <rule>ATTR{address}</rule>
+        <value>$mac.lower()</value>
+      </rule>
+      #end if
+      #end if
+    #end for
+    #end if
+    </net-udev>
+    <routing>
+      <ip_forward config:type="boolean">false</ip_forward>
+      #if $getVar("system_name","") != ""
+      ## TODO: add in static routes here
+      <routes config:type="list">
+        <route>
+          <destination>default</destination>
+          <netmask>-</netmask>
+          <device>-</device>
+          <gateway>$gateway</gateway>
+        </route>
+      </routes>
+      #end if
+    </routing>
+  </networking>
-- 
cgit 1.2.3-korg