motd.erb change

NEWS

 unreleased (207x-xx-xx)
 
+    [os] motd.erb needs to handle case when there is no swap.
+
     [several] change 'crit "stuff"' to 'crit("stuff")' to make Puppet 5
     happy. [adamhl]
 

templates/os/motd.erb

@@ -33,12 +33,17 @@
     end
     memory = memory.gsub(/\s+/, '')
 
-    swap = @swapsize
-    if swap.match(/\./)
-      swap = swap.sub(/0+ /, ' ')
-      swap = swap.sub(/\. /, ' ')
+    # Not every server has a swap disk
+    if (@swapsize) then
+      swap = @swapsize
+      if swap.match(/\./)
+        swap = swap.sub(/0+ /, ' ')
+        swap = swap.sub(/\. /, ' ')
+      end
+      swap = swap.gsub(/\s+/, '')
+    else
+      swap = 'No'
     end
-    swap = swap.gsub(/\s+/, '')
 -%>
 <%= host %> - <%= os %>, <%= @architecture %>
 <%= @processorcount %>-core <%= processor %> (<%= product %>); <%= memory %> RAM, <%= swap %> swap