delete the windows newline character

JIRA: COMPASS-7

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

1 files changed, 98 insertions, 98 deletions

diff --git a/deploy/adapters/cobbler/conf/dhcp.template b/deploy/adapters/cobbler/conf/dhcp.template
index 2a71bc12..79b2037d 100644
--- a/deploy/adapters/cobbler/conf/dhcp.template
+++ b/deploy/adapters/cobbler/conf/dhcp.template
@@ -1,98 +1,98 @@
-# ******************************************************************

-# Cobbler managed dhcpd.conf file

-#

-# generated from cobbler dhcp.conf template ($date)

-# Do NOT make changes to /etc/dhcpd.conf. Instead, make your changes

-# in /etc/cobbler/dhcp.template, as /etc/dhcpd.conf will be

-# overwritten.

-#

-# ******************************************************************

-

-ddns-update-style interim;

-

-allow booting;

-allow bootp;

-deny unknown-clients;

-local-address $ipaddr;

-log-facility local6;

-

-ignore client-updates;

-set vendorclass = option vendor-class-identifier;

-

-option pxe-system-type code 93 = unsigned integer 16;

-option space pxelinux;

-option pxelinux.magic      code 208 = string;

-option pxelinux.configfile code 209 = text;

-option pxelinux.pathprefix code 210 = text;

-option pxelinux.reboottime code 211 = unsigned integer 32;

-

-subnet $subnet netmask $netmask {

-     option routers $gateway;

-     option domain-name-servers $ipaddr;

-     option subnet-mask $netmask;

-     range dynamic-bootp $ip_range;

-     default-lease-time 21600;

-     max-lease-time 43200;

-     next-server $next_server;

-     class "pxeclients" {

-          match if substring (option vendor-class-identifier, 0, 9) = "PXEClient";

-          if option pxe-system-type = 00:02 {

-                  filename "ia64/elilo.efi";

-          } else if option pxe-system-type = 00:06 {

-                  filename "grub/grub-x86.efi";

-          } else if option pxe-system-type = 00:07 {

-                  filename "grub/grub-x86_64.efi";

-          } else {

-                  filename "pxelinux.0";

-          }

-     }

-

-}

-

-#for dhcp_tag in $dhcp_tags.keys():

-    ## group could be subnet if your dhcp tags line up with your subnets

-    ## or really any valid dhcpd.conf construct ... if you only use the

-    ## default dhcp tag in cobbler, the group block can be deleted for a

-    ## flat configuration

-# group for Cobbler DHCP tag: $dhcp_tag

-group {

-        #for mac in $dhcp_tags[$dhcp_tag].keys():

-            #set iface = $dhcp_tags[$dhcp_tag][$mac]

-    host $iface.name {

-        hardware ethernet $mac;

-        site-option-space "pxelinux";

-        option pxelinux.magic f1:00:74:7e;

-        if exists dhcp-parameter-request-list {

-            # Always send the PXELINUX options (specified in hexadecimal)

-            option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list,d0,d1,d2,d3);

-        }

-        option pxelinux.reboottime 30;

-        #if $iface.hostname:

-        option host-name "$iface.hostname";

-        #end if

-        #if $iface.netmask:

-        option subnet-mask $iface.netmask;

-        #end if

-        #if $iface.gateway:

-        option routers $iface.gateway;

-        #end if

-        #if $iface.enable_gpxe:

-        if exists user-class and option user-class = "gPXE" {

-            filename "http://$cobbler_server/cblr/svc/op/gpxe/system/$iface.owner";

-        } else if exists user-class and option user-class = "iPXE" {

-            filename "http://$cobbler_server/cblr/svc/op/gpxe/system/$iface.owner";

-        } else {

-            filename "undionly.kpxe";

-        }

-        #else

-        filename "$iface.filename";

-        #end if

-        ## Cobbler defaults to $next_server, but some users

-        ## may like to use $iface.system.server for proxied setups

-        next-server $next_server;

-        ## next-server $iface.next_server;

-    }

-        #end for

-}

-#end for

-

+# ******************************************************************
+# Cobbler managed dhcpd.conf file
+#
+# generated from cobbler dhcp.conf template ($date)
+# Do NOT make changes to /etc/dhcpd.conf. Instead, make your changes
+# in /etc/cobbler/dhcp.template, as /etc/dhcpd.conf will be
+# overwritten.
+#
+# ******************************************************************
+
+ddns-update-style interim;
+
+allow booting;
+allow bootp;
+deny unknown-clients;
+local-address $ipaddr;
+log-facility local6;
+
+ignore client-updates;
+set vendorclass = option vendor-class-identifier;
+
+option pxe-system-type code 93 = unsigned integer 16;
+option space pxelinux;
+option pxelinux.magic      code 208 = string;
+option pxelinux.configfile code 209 = text;
+option pxelinux.pathprefix code 210 = text;
+option pxelinux.reboottime code 211 = unsigned integer 32;
+
+subnet $subnet netmask $netmask {
+     option routers $gateway;
+     option domain-name-servers $ipaddr;
+     option subnet-mask $netmask;
+     range dynamic-bootp $ip_range;
+     default-lease-time 21600;
+     max-lease-time 43200;
+     next-server $next_server;
+     class "pxeclients" {
+          match if substring (option vendor-class-identifier, 0, 9) = "PXEClient";
+          if option pxe-system-type = 00:02 {
+                  filename "ia64/elilo.efi";
+          } else if option pxe-system-type = 00:06 {
+                  filename "grub/grub-x86.efi";
+          } else if option pxe-system-type = 00:07 {
+                  filename "grub/grub-x86_64.efi";
+          } else {
+                  filename "pxelinux.0";
+          }
+     }
+
+}
+
+#for dhcp_tag in $dhcp_tags.keys():
+    ## group could be subnet if your dhcp tags line up with your subnets
+    ## or really any valid dhcpd.conf construct ... if you only use the
+    ## default dhcp tag in cobbler, the group block can be deleted for a
+    ## flat configuration
+# group for Cobbler DHCP tag: $dhcp_tag
+group {
+        #for mac in $dhcp_tags[$dhcp_tag].keys():
+            #set iface = $dhcp_tags[$dhcp_tag][$mac]
+    host $iface.name {
+        hardware ethernet $mac;
+        site-option-space "pxelinux";
+        option pxelinux.magic f1:00:74:7e;
+        if exists dhcp-parameter-request-list {
+            # Always send the PXELINUX options (specified in hexadecimal)
+            option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list,d0,d1,d2,d3);
+        }
+        option pxelinux.reboottime 30;
+        #if $iface.hostname:
+        option host-name "$iface.hostname";
+        #end if
+        #if $iface.netmask:
+        option subnet-mask $iface.netmask;
+        #end if
+        #if $iface.gateway:
+        option routers $iface.gateway;
+        #end if
+        #if $iface.enable_gpxe:
+        if exists user-class and option user-class = "gPXE" {
+            filename "http://$cobbler_server/cblr/svc/op/gpxe/system/$iface.owner";
+        } else if exists user-class and option user-class = "iPXE" {
+            filename "http://$cobbler_server/cblr/svc/op/gpxe/system/$iface.owner";
+        } else {
+            filename "undionly.kpxe";
+        }
+        #else
+        filename "$iface.filename";
+        #end if
+        ## Cobbler defaults to $next_server, but some users
+        ## may like to use $iface.system.server for proxied setups
+        next-server $next_server;
+        ## next-server $iface.next_server;
+    }
+        #end for
+}
+#end for
+