From 1ae4a2d30c30705bd3710a0f768ac9143a1f8133 Mon Sep 17 00:00:00 2001
From: Adam Henry Lewenberg <adamhl@stanford.edu>
Date: Fri, 1 Dec 2017 14:49:42 -0800
Subject: [PATCH] more puppet5 changes
---
manifests/ipmi.pp | 2 +-
templates/os/motd.erb | 30 +++++++++++++++---------------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/manifests/ipmi.pp b/manifests/ipmi.pp
index 12f46dc..4145f68 100644
--- a/manifests/ipmi.pp
+++ b/manifests/ipmi.pp
@@ -22,7 +22,7 @@ class base::ipmi (
) {
# If we are virtual or on EC2, then explicitly disable IPMI
- if $::is_virtual == 'true' or $::ec2_profile == 'default-paravirtual' {
+ if ($is_virtual or ($::ec2_profile == 'default-paravirtual')) {
$real_ensure = absent
}
else {
diff --git a/templates/os/motd.erb b/templates/os/motd.erb
index 44b11cc..77f8e49 100644
--- a/templates/os/motd.erb
+++ b/templates/os/motd.erb
@@ -1,7 +1,7 @@
<% os = @lsbdistdescription.gsub(/Debian GNU\/Linux/, "Debian")
- os.gsub!(/Red Hat Enterprise Linux/i, 'RHEL')
- os.gsub!(/RHEL (\w+) release (\d+) \(.* (\d+)\)/i, 'RHEL \1 \2u\3')
- os.gsub!(/RHEL (\w+) release ([\d\.]+) \(.*\)/i, 'RHEL \1 \2')
+ os = os.gsub(/Red Hat Enterprise Linux/i, 'RHEL')
+ os = os.gsub(/RHEL (\w+) release (\d+) \(.* (\d+)\)/i, 'RHEL \1 \2u\3')
+ os = os.gsub(/RHEL (\w+) release ([\d\.]+) \(.*\)/i, 'RHEL \1 \2')
processor = @processor0.strip.gsub(/\s+/, " ")
processor = processor.strip.gsub(/\(R\)|\(TM\)/i, '')
@@ -14,12 +14,12 @@
if product.nil?
product = "unknown"
else
- product.strip!
- product.gsub!(/VMware Virtual Platform/i, 'vmware')
- product.gsub!(/ Server/i, '')
- product.gsub!(/SUN BLADE /i, 'SB ')
- product.gsub!(/Precision WorkStation /i, '')
- product.gsub!(/ MODULE/i, '')
+ product = product.strip
+ product = product.gsub(/VMware Virtual Platform/i, 'vmware')
+ product = product.gsub(/ Server/i, '')
+ product = product.gsub(/SUN BLADE /i, 'SB ')
+ product = product.gsub(/Precision WorkStation /i, '')
+ product = product.gsub(/ MODULE/i, '')
end
sn = @serialnumber rescue nil
if @virtual == 'physical' and (! sn.nil?)
@@ -28,17 +28,17 @@
memory = @memorysize
if memory.match(/\./)
- memory.sub!(/0+ /, ' ')
- memory.sub!(/\. /, ' ')
+ memory = memory.sub(/0+ /, ' ')
+ memory = memory.sub(/\. /, ' ')
end
- memory.gsub!(/\s+/, '')
+ memory = memory.gsub(/\s+/, '')
swap = @swapsize
if swap.match(/\./)
- swap.sub!(/0+ /, ' ')
- swap.sub!(/\. /, ' ')
+ swap = swap.sub(/0+ /, ' ')
+ swap = swap.sub(/\. /, ' ')
end
- swap.gsub!(/\s+/, '')
+ swap = swap.gsub(/\s+/, '')
-%>
<%= host %> - <%= os %>, <%= @architecture %>
<%= @processorcount %>-core <%= processor %> (<%= product %>); <%= memory %> RAM, <%= swap %> swap
--
GitLab