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

Reviewed-on: #23

.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-centos, ansible-dev-fedora, ansible-dev-debian ]
-    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.35
+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

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

@@ -8,13 +8,9 @@
         {{ motd_host_uptime | regex_replace(motd_nonday_filter, motd_nonday_filter_repl) }}
       {% endif %}
 
-
 - name: Update MOTD
   ansible.builtin.template:
     src: templates/motd.j2
     dest: "{{ motd_motd_file }}"
     mode: "0644"
   changed_when: false
-
-
-...

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: