Merge pull request '1.0.35' (#22) from testing into main

Reviewed-on: #22

.gitea/workflows/ansible-test.yml

@@ -9,7 +9,7 @@ jobs:
   Ansible-Development-Pipeline:
     strategy:
       matrix:
-        os: [ ansible-dev-centos9, ansible-dev-fedora39, ansible-dev-debian11, ansible-dev-debian12 ]
+        os: [ ansible-dev-centos, ansible-dev-fedora, ansible-dev-debian ]
     runs-on: ${{ matrix.os }}
 
     steps:

galaxy.yml

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

meta/runtime.yml

@@ -1,2 +1,2 @@
 ---
-requires_ansible: ">=2.14.0"
+requires_ansible: ">=2.15.0"

roles/etc_hosts/tasks/main.yml

@@ -3,7 +3,7 @@
   ansible.builtin.set_fact:
     etc_hosts_etc_hosts_file: "{{ etc_hosts_etc_hosts_file }}.docker"
   when:
-    - ansible_virtualization_type | regex_search("docker|podman|container")
+    - ansible_virtualization_type is search("docker|podman|container")
 
 
 - name: Deploy {{ etc_hosts_etc_hosts_file }}

roles/hostname/tasks/main.yml

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

roles/motd/tasks/main.yml

@@ -1,7 +1,7 @@
 ---
 - name: Format uptime using Jinja
   ansible.builtin.set_fact:
-    uptime_formatted: |
+    motd_uptime_formatted: |
       {% if 'day' in motd_host_uptime %}
         {{ motd_host_uptime | regex_replace(motd_day_filter, motd_day_filter_repl) }}
       {% else %}
@@ -11,10 +11,10 @@
 
 - name: Update MOTD
   ansible.builtin.template:
-    src        : templates/motd.j2
+    src: templates/motd.j2
-    dest       : "{{ motd_motd_file }}"
+    dest: "{{ motd_motd_file }}"
-    mode       : "0644"
+    mode: "0644"
-  changed_when : false
+  changed_when: false
 
 
 ...

roles/motd/templates/motd.j2

@@ -19,6 +19,6 @@ IP       : {{ motd_host_ip }}
 CPU      : {{ ansible_processor_vcpus }} x {{ ansible_processor[2] | regex_replace('\\s+', ' ') }}
 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 | trim }}
+Up       : {{ motd_uptime_formatted | trim }}
 
 

roles/node_status/tasks/main.yml

@@ -1,33 +1,31 @@
 ---
 - name: Update node status when not running in a container
-  when: not ansible_virtualization_type | regex_search("docker|podman|container")
+  when: not ansible_virtualization_type is search("docker|podman|container")
   block:
     - name: Create directory {{ node_status_dir }}
       ansible.builtin.file:
-        path      : "{{ node_status_dir }}"
+        path: "{{ node_status_dir }}"
-        state     : directory
+        state: directory
-        mode      : '0755'
+        mode: '0755'
-      become      : false
+      become: false
-      run_once    : true
+      run_once: true
-      delegate_to : "{{ node_status_host }}"
+      delegate_to: "{{ node_status_host }}"
-
 
     - name: Capture system uptime
       ansible.builtin.command  : uptime
-      register : r_node_status_uptime
+      register: node_status_sys_uptime
       changed_when: false
 
-
     - name: Log node status
       ansible.builtin.lineinfile:
-        path      : "{{ node_status_dir }}/{{ node_status_file }}"
+        path: "{{ node_status_dir }}/{{ node_status_file }}"
-        state     : present
+        state: present
-        regexp    : "{{ inventory_hostname }}"
+        regexp: "{{ inventory_hostname }}"
-        line      : "{{ ansible_date_time.epoch }},,{{ inventory_hostname }},,{{ ansible_distribution }} {{ ansible_distribution_version }},,{{ r_node_status_uptime.stdout }}"
+        line: "{{ ansible_date_time.epoch }},,{{ inventory_hostname }},,{{ ansible_distribution }} {{ ansible_distribution_version }},,{{ node_status_sys_uptime.stdout }}"
-        create    : true
+        create: true
-        mode      : '0644'
+        mode: '0644'
-        owner     : "{{ node_status_user }}"
+        owner: "{{ node_status_user }}"
-        group     : "{{ node_status_group }}"
+        group: "{{ node_status_group }}"
-      delegate_to : "{{ node_status_host }}"
+      delegate_to: "{{ node_status_host }}"
-      throttle    : 1
+      throttle: 1
 

roles/resolv_conf/tasks/main.yml

@@ -3,7 +3,7 @@
   ansible.builtin.set_fact:
     resolv_conf_resolv_conf_file: "{{ resolv_conf_resolv_conf_file }}.container"
   when:
-    - ansible_virtualization_type | regex_search("docker|podman|container")
+    - ansible_virtualization_type is search("docker|podman|container")
 
 
 - name: Deploy {{ resolv_conf_resolv_conf_file }}

roles/snmpd_conf/handlers/main.yml

@@ -4,4 +4,4 @@
     name : snmpd
     state: restarted
   when:
-    - not ansible_virtualization_type | regex_search("docker|podman|container")
+    - not ansible_virtualization_type is search("docker|podman|container")