Merge pull request '1.0.32' (#19) from testing into main

Reviewed-on: #19

galaxy.yml

@@ -8,7 +8,7 @@ namespace: jchristianh
 name: baseos
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 1.0.30
+version: 1.0.32
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md

roles/motd/tasks/main.yml

@@ -1,16 +1,12 @@
 ---
-- name: Format uptime containing days
+- name: Format uptime using Jinja
   ansible.builtin.set_fact:
-    uptime_formatted: "{{ motd_host_uptime | regex_replace(motd_day_filter, motd_day_filter_repl) }}"
+    uptime_formatted: |
-  when:
+      {% if 'day' in motd_host_uptime %}
-    - "'day' in motd_host_uptime"
+        {{ motd_host_uptime | regex_replace(motd_day_filter, motd_day_filter_repl) }}
-
+      {% else %}
-
+        {{ motd_host_uptime | regex_replace(motd_nonday_filter, motd_nonday_filter_repl) }}
-- name: Format uptime not containing days
+      {% endif %}
-  ansible.builtin.set_fact:
-    uptime_formatted: "{{ motd_host_uptime | regex_replace(motd_nonday_filter, motd_nonday_filter_repl) }}"
-  when:
-    - "'day' not in motd_host_uptime"
 
 
 - name: Update MOTD

roles/motd/templates/motd.j2

@@ -19,6 +19,6 @@ IP       : {{ motd_host_ip }}
 CPU      : {{ ansible_processor_vcpus }} x {{ ansible_processor[2] }}
 Memory   : {{ "{0:0.2f}".format(ansible_memfree_mb/1024) }} GB free of {{ (ansible_memtotal_mb/1024)|round}} GB
 Platform : {{ ansible_distribution }} {{ ansible_distribution_version }} {{ ansible_kernel }}
-Up       : {{ uptime_formatted }}
+Up       : {{ uptime_formatted | trim }}
 
 

roles/node_status/defaults/main.yml

@@ -1,7 +1,6 @@
 ---
-node_status_host  : zg-lxut02.thezengarden.net
+node_status_host  : node-status.thezengarden.net
 node_status_user  : chris
 node_status_group : chris
 node_status_dir   : /home/chris/node_status
 node_status_file  : status.csv
-node_status_lc    : 3