From 79b3a225193abd06cc62cebfcfa99e9a5cc0efa5 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Mon, 25 Aug 2025 13:28:27 -0400 Subject: [PATCH] Fixes --- .drone.env => .ci.env | 0 .drone.yml | 111 ------------------------------ .gitea/workflows/ansible-test.yml | 22 +++--- galaxy.yml | 2 +- roles/motd/defaults/main.yml | 10 +-- roles/motd/tasks/main.yml | 4 -- roles/snmpd_conf/tasks/main.yml | 3 +- 7 files changed, 19 insertions(+), 133 deletions(-) rename .drone.env => .ci.env (100%) delete mode 100644 .drone.yml diff --git a/.drone.env b/.ci.env similarity index 100% rename from .drone.env rename to .ci.env diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index b310303..0000000 --- a/.drone.yml +++ /dev/null @@ -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 diff --git a/.gitea/workflows/ansible-test.yml b/.gitea/workflows/ansible-test.yml index 9e87be0..2bc2746 100644 --- a/.gitea/workflows/ansible-test.yml +++ b/.gitea/workflows/ansible-test.yml @@ -7,10 +7,7 @@ on: jobs: Ansible-Development-Pipeline: - strategy: - matrix: - os: [ ansible-dev-centos, ansible-dev-fedora, ansible-dev-debian ] - runs-on: ${{ matrix.os }} + runs-on: ansible-dev-centos steps: - name: Clone repository @@ -18,13 +15,18 @@ jobs: - name: Ansible Environment Verify run: | - . ./.drone.env - env - git log -1 - ansible --version - ansible-lint --version + echo "BUILD HOST: $(cat /etc/hostname)" && echo + echo "BUILD USER: $(whoami)" && echo + echo "PWD: $(pwd)" && echo + lscpu && echo + . ./.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 diff --git a/galaxy.yml b/galaxy.yml index d6831b9..6099bde 100644 --- a/galaxy.yml +++ b/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 diff --git a/roles/motd/defaults/main.yml b/roles/motd/defaults/main.yml index 036a7f6..e31bbff 100644 --- a/roles/motd/defaults/main.yml +++ b/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_uptime : "{{ now().replace(microsecond=0) - now().fromtimestamp(now(fmt='%s') | int - ansible_uptime_seconds) }}" +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: "(.* day[s]?),\\s+(\\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" ... diff --git a/roles/motd/tasks/main.yml b/roles/motd/tasks/main.yml index a6b46ac..d619679 100644 --- a/roles/motd/tasks/main.yml +++ b/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 - - -... diff --git a/roles/snmpd_conf/tasks/main.yml b/roles/snmpd_conf/tasks/main.yml index 601d5b1..7d39e36 100644 --- a/roles/snmpd_conf/tasks/main.yml +++ b/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: -- 2.47.3