Merge pull request '1.0.36' (#23) from testing into main

Reviewed-on: #23

.ansible-lint

@@ -4,3 +4,5 @@ skip_list:
   - yaml[line-length]
   - no-changed-when
   - galaxy[no-changelog]
+  - no-free-form
+  - package-latest

.drone.yml

@@ -1,111 +0,0 @@
----
-kind: pipeline
-type: docker
-name: CentOS_9-Ansible-Pipeline
-
-trigger:
-  branch:
-    exclude:
-      - main
-  event: [push]
-
-steps:
-  - name: ansible_environment_verify
-    image: gitea.thezengarden.net/podman/ansible-dev/centos9:release
-    commands:
-      - . ./.drone.env
-      - env
-      - git log -1
-      - ansible --version
-      - ansible-lint --version
-
-  - name: ansible_lint
-    image: gitea.thezengarden.net/podman/ansible-dev/centos9:release
-    commands:
-      - . ./.drone.env
-      - ansible-lint --offline --nocolor $ANSIBLE_LINT_EXCLUSION
-
-
----
-kind: pipeline
-type: docker
-name: Fedora_39-Ansible-Pipeline
-
-trigger:
-  branch:
-    exclude:
-      - main
-  event: [push]
-
-steps:
-  - name: ansible_environment_verify
-    image: gitea.thezengarden.net/podman/ansible-dev/fedora39:release
-    commands:
-      - . ./.drone.env
-      - env
-      - git log -1
-      - ansible --version
-      - ansible-lint --version
-
-  - name: ansible_lint
-    image: gitea.thezengarden.net/podman/ansible-dev/fedora39:release
-    commands:
-      - . ./.drone.env
-      - ansible-lint --offline --nocolor $ANSIBLE_LINT_EXCLUSION
-
-
----
-kind: pipeline
-type: docker
-name: Debian_11-Ansible-Pipeline
-
-trigger:
-  branch:
-    exclude:
-      - main
-  event: [push]
-
-steps:
-  - name: ansible_environment_verify
-    image: gitea.thezengarden.net/podman/ansible-dev/debian11:release
-    commands:
-      - . ./.drone.env
-      - env
-      - git log -1
-      - ansible --version
-      - ansible-lint --version
-
-  - name: ansible_lint
-    image: gitea.thezengarden.net/podman/ansible-dev/debian11:release
-    commands:
-      - . ./.drone.env
-      - ansible-lint --offline --nocolor $ANSIBLE_LINT_EXCLUSION
-
-
----
-kind: pipeline
-type: docker
-name: Debian_12-Ansible-Pipeline
-
-
-trigger:
-  branch:
-    exclude:
-      - main
-  event: [push]
-
-steps:
-  - name: ansible_environment_verify
-    image: gitea.thezengarden.net/podman/ansible-dev/debian12:release
-    commands:
-      - . ./.drone.env
-      - env
-      - git log -1
-      - ansible --version
-      - ansible-lint --version
-
-  - name: ansible_lint
-    image: gitea.thezengarden.net/podman/ansible-dev/debian12:release
-    commands:
-      - . ./.drone.env
-      - ansible-lint --offline --nocolor $ANSIBLE_LINT_EXCLUSION

.gitea/workflows/ansible-test.yml

@@ -7,10 +7,7 @@ on:
 
 jobs:
   Ansible-Development-Pipeline:
-    strategy:
+    runs-on: ansible-dev-centos
-      matrix:
-        os: [ ansible-dev-centos9, ansible-dev-fedora39, ansible-dev-debian11, ansible-dev-debian12 ]
-    runs-on: ${{ matrix.os }}
 
     steps:
       - name: Clone repository
@@ -18,13 +15,18 @@ jobs:
 
       - name: Ansible Environment Verify
         run: |
-          . ./.drone.env
+          echo "BUILD HOST: $(cat /etc/hostname)" && echo
-          env
+          echo "BUILD USER: $(whoami)" && echo
-          git log -1
+          echo "PWD: $(pwd)" && echo
-          ansible --version
+          lscpu && echo
-          ansible-lint --version
+          . ./.ci.env && echo
+          env && echo
+          git log -1 && echo
+          ansible --version && echo
+          ansible-lint --version --offline && echo
+
 
       - name: Run Ansible-Lint
         run: |
-          . ./.drone.env
+          . ./.ci.env
           ansible-lint --offline --nocolor $ANSIBLE_LINT_EXCLUSION

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.36
 
 # 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/defaults/main.yml

@@ -1,13 +1,13 @@
 ---
 motd_motd_file: /etc/motd
 
-motd_host_ip       : "{{ ansible_default_ipv4.address | default('127.0.0.1') }}"
+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_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_day_filter: "(.* day[s]?),\\s+(\\d+):(\\d+):(\\d+)"
-motd_nonday_filter : "(\\d+):(\\d+):(\\d+)"
+motd_nonday_filter: "(\\d+):(\\d+):(\\d+)"
 
-motd_day_filter_repl    : "\\1 \\2 hours \\3 minutes"
+motd_day_filter_repl: "\\1 \\2 hours \\3 minutes"
 motd_nonday_filter_repl : "\\1 hours \\2 minutes \\3 seconds"
 
 ...

roles/motd/tasks/main.yml

@@ -1,24 +1,16 @@
 ---
-- 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) }}"
+    motd_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
   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

@@ -16,9 +16,9 @@
 
 Host     : {{ inventory_hostname }}
 IP       : {{ motd_host_ip }}
-CPU      : {{ ansible_processor_vcpus }} x {{ ansible_processor[2] }}
+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 }}
+Up       : {{ motd_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

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")

roles/snmpd_conf/tasks/main.yml

@@ -1,12 +1,11 @@
 ---
 - name: Deploy and configure SNMP
   block:
-    - name: Set package name for Debian 12
+    - name: Set package name for Debian
       ansible.builtin.set_fact:
         snmpd_conf_snmp_pkg: snmpd
       when:
         - ansible_distribution | lower == 'debian'
-        - ansible_distribution_major_version == '12'
 
     - name: Install SNMP
       ansible.builtin.package:

roles/update_all_packages/tasks/main.yml

@@ -1,29 +1,21 @@
 ---
 - name: Update package cache for Debian hosts
-  apt:
+  ansible.builtin.apt:
     update_cache: true
   when:
-    - ansible_distribution|lower == 'debian'
+    - "'apt' in ansible_pkg_mgr"
-  tags:
-    - skip_ansible_lint
 
 
 - name: Update package cache for RHEL/CentOS/Fedora hosts
-  dnf:
+  ansible.builtin.dnf:
     update_cache: true
   when:
-    - (ansible_distribution|lower == 'centos' or
+    - "'dnf' in ansible_pkg_mgr"
-      ansible_distribution|lower == 'fedora' or
-      ansible_distribution|lower == 'redhat')
     - ansible_distribution_major_version|int >= 8
-  tags:
-    - skip_ansible_lint
 
 
 - name: Update all host packages
-  package: name=* state=latest
+  ansible.builtin.package: name=* state=latest
-  tags:
-    - skip_ansible_lint
 
 
 ...