site/profiles/manifests/base/motd.pp

@@ -7,6 +7,8 @@ class profiles::base::motd (
   String  $nic        = $facts['networking']['primary'],
   String  $os_name    = $facts['os']['name'],
   String  $os_release = $facts['os']['release']['full'],
+  String  $location   = "${facts['country']}-${facts['region']}",
+  String  $env        = $facts['environment'],
 ) {
 
   # Use the regsubst function to remove the 'roles::' prefix from the role name

site/profiles/templates/base/motd/motd.erb

@@ -1,6 +1,6 @@
 <%
 # calculate padding for the longest word
-max_length = ['fqdn:', 'os:', 'role:', 'branch:', 'addr:', 'nic:'].max_by(&:length).length
+max_length = ['fqdn:', 'os:', 'role:', 'branch:', 'addr:', 'nic:', 'location:', 'env:'].max_by(&:length).length
 # helper lambda to right-align text
 align = ->(word) { word.ljust(max_length) }
 %>
@@ -10,4 +10,6 @@ align = ->(word) { word.ljust(max_length) }
 <%= align.call('branch:') %> <%= @enc_env %>
 <%= align.call('addr:') %> <%= @addr %>
 <%= align.call('nic:') %> <%= @nic %>
+<%= align.call('location:') %> <%= @location %>
+<%= align.call('env:') %> <%= @env %>