X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Ftemplates%2Fmotd.erb;h=6b4f640ad4b9c8c780e6fc8632c182646d9b439e;hb=2d49db104be23f1b4e29600d28cc491a618f5960;hp=50a99dd6a3c0f11f30afb47b92d9f1ea02d1eadc;hpb=e3547a89085e966acf32202ac13a2b492e8282b7;p=mirror%2Fdsa-puppet.git diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb index 50a99dd6a..6b4f640ad 100644 --- a/modules/motd/templates/motd.erb +++ b/modules/motd/templates/motd.erb @@ -110,7 +110,7 @@ end if scope.lookupvar('::cluster').to_s != 'undefined' purp += "\n This server is a node in ganeti cluster: " purp += scope.lookupvar('::cluster').to_s + ":\n" - purp += "\t" + scope.lookupvar('::cluster_nodes').sort.map{ |x| x.split('.')[0] }.join(", ") + ".\n" + purp += "\t" + scope.lookupvar('::cluster_nodes').split.sort.map{ |x| x.split('.')[0] }.join(", ") + ".\n" if @lsbmajdistrelease >= '7' purp += "" @@ -130,7 +130,7 @@ end if classes.include?("porterbox") - purp += "\n " + wrap("Disk space on porter boxes is often limited. Please respect your fellow porters by cleaning up after yourself and deleting schroots and source/build trees in your ~ as soon as feasible. DSA reserves the right to recover disk space as necessary. See for a brief tutorial on using schroot.") + purp += "\n " + wrap("Disk space on porter boxes is often limited. Please respect your fellow porters by cleaning up after yourself and deleting schroots and source/build trees in your ~ as soon as feasible. DSA reserves the right to recover disk space as necessary. See for a brief tutorial on using schroot. There may be chroots for architectures other than #{arch} available, please list available chroots to check.") end if ninfo['not-bacula-client'] then