Merge pull request '1.0.29' (#16) from testing into main

Reviewed-on: #16

galaxy.yml

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

roles/hostname/tasks/main.yml

@@ -1,6 +1,8 @@
 ---
 
 - name: Use hostname module to set hostname, or failback to command module
+  when:
+    - not ansible_virtualization_type | regex_search("docker|podman|container")
   block:
     - name: Set hostname for host using hostname module
       ansible.builtin.hostname:

roles/motd/defaults/main.yml

@@ -1,5 +1,13 @@
 ---
 motd_motd_file: /etc/motd
 
+motd_host_ip       : "{{ ansible_default_ipv4.address | default('127.0.0.1') }}"
+motd_host_uptime   : "{{ now().replace(microsecond=0) - now().fromtimestamp(now(fmt='%s') | int - ansible_uptime_seconds) }}"
+
+motd_day_filter    : "(.* day[s]?),\\s+(\\d+):(\\d+):(\\d+)"
+motd_nonday_filter : "(\\d+):(\\d+):(\\d+)"
+
+motd_day_filter_repl    : "\\1 \\2 hours \\3 minutes"
+motd_nonday_filter_repl : "\\1 hours \\2 minutes \\3 seconds"
 
 ...

roles/motd/scripts/get_uptime.pl

@@ -1,21 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-
-my $seconds = shift;
-my $string  = sprintf "%02d::%02d::%02d::%02d", (gmtime($seconds))[7,2,1,0];
-
-# days [0] :: hours [1] :: mins [2] :: seconds [3]
-my @ups = split(/::/, $string);
-
-my $return_uptime = "";
-
-my $i = 0;
-for (@ups) { $ups[$i] =~ s/^0//g; $i++; }
-
-$return_uptime .= "$ups[0] days "    if $ups[0] != 0;
-$return_uptime .= "$ups[1] hours "   if $ups[1] != 0;
-$return_uptime .= "$ups[2] minutes " if $ups[2] != 0;
-# $return_uptime .= "$ups[3] seconds"  if $ups[3] != 0;
-
-print "$return_uptime\n";

roles/motd/tasks/main.yml

@@ -1,20 +1,16 @@
 ---
-- name: Set host IP address or set a default
+- name: Format uptime containing days
   ansible.builtin.set_fact:
-    host_ip : "{{ ansible_default_ipv4.address | default('127.0.0.1') }}"
+    uptime_formatted: "{{ motd_host_uptime | regex_replace(motd_day_filter, motd_day_filter_repl) }}"
+  when:
+    - "'day' in motd_host_uptime"
 
 
-- name: Install Perl if needed
+- name: Format uptime not containing days
-  ansible.builtin.package:
+  ansible.builtin.set_fact:
-    name  : perl
+    uptime_formatted: "{{ motd_host_uptime | regex_replace(motd_nonday_filter, motd_nonday_filter_repl) }}"
-    state : present
+  when:
-
+    - "'day' not in motd_host_uptime"
-
-- name: Get system uptime from script
-  ansible.builtin.script:
-    cmd        : "scripts/get_uptime.pl {{ ansible_uptime_seconds }}"
-  register     : node_uptime
-  changed_when : false
 
 
 - name: Update MOTD
@@ -26,4 +22,3 @@
 
 
 ...
-

roles/motd/templates/motd.j2

@@ -14,11 +14,11 @@
                   |___/
 
 
-Host     : {{ ansible_fqdn }}
+Host     : {{ inventory_hostname }}
-IP       : {{ host_ip }}
+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       : {{ node_uptime.stdout }}
+Up       : {{ uptime_formatted }}