Merge pull request '1.0.34' (#21) from testing into main

Reviewed-on: #21

.ansible-lint

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

galaxy.yml

@@ -8,7 +8,7 @@ namespace: jchristianh
 name: baseos
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 1.0.22
+version: 1.0.34
 
 # 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.15.0"
+requires_ansible: ">=2.14.0"

roles/base_packages/meta/main.yml

@@ -4,7 +4,7 @@ galaxy_info:
 
   license: GPL-2.0-or-later
 
-  min_ansible_version: "2.14"
+  min_ansible_version: "2.14.0"
 
   platforms:
     - name: Fedora

roles/bashrc/meta/main.yml

@@ -4,7 +4,7 @@ galaxy_info:
 
   license: GPL-2.0-or-later
 
-  min_ansible_version: "2.14"
+  min_ansible_version: "2.14.0"
 
   platforms:
     - name: Fedora

roles/default_services/meta/main.yml

@@ -4,7 +4,7 @@ galaxy_info:
 
   license: GPL-2.0-or-later
 
-  min_ansible_version: "2.14"
+  min_ansible_version: "2.14.0"
 
   platforms:
     - name: Fedora

roles/dnf_conf/README.md

@@ -0,0 +1,38 @@
+Role Name
+=========
+
+A brief description of the role goes here.
+
+Requirements
+------------
+
+Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
+
+Role Variables
+--------------
+
+A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
+
+Dependencies
+------------
+
+A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: username.rolename, x: 42 }
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).

roles/dnf_conf/defaults/main.yml

@@ -0,0 +1,16 @@
+---
+dnf_conf_maintainer       : "Chris H."
+dnf_conf_maintainer_email : "<chris@thezengarden.net>"
+
+dnf_conf_file     : "/etc/dnf/dnf.conf"
+dnf_conf_version  : 1.0
+dnf_conf_revision : 2433621
+
+dnf_conf_fastest_mirror : "False"
+dnf_conf_gpg_check      : "1"
+
+dnf_conf_max_downloads  : 20
+
+
+
+...

roles/dnf_conf/meta/main.yml

@@ -0,0 +1,29 @@
+galaxy_info:
+  author: Chris Hammer
+  description: Deploys a standard /etc/dnf/dnf.conf
+
+  license: GPL-2.0-or-later
+
+  min_ansible_version: "2.14.0"
+
+  platforms:
+    - name: Fedora
+      versions:
+        - all
+
+    - name: EL
+      versions:
+        - "8"
+        - "9"
+
+  galaxy_tags: []
+    # List tags for your role here, one per line. A tag is a keyword that describes
+    # and categorizes the role. Users find roles by searching for tags. Be sure to
+    # remove the '[]' above, if you add tags to this list.
+    #
+    # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
+    #       Maximum 20 tags per role.
+
+dependencies: []
+  # List your role dependencies here, one per line. Be sure to remove the '[]' above,
+  # if you add dependencies to this list.

roles/dnf_conf/tasks/main.yml

@@ -0,0 +1,11 @@
+---
+- name: Deploy {{ dnf_conf_file }}
+  ansible.builtin.template:
+    src: templates/dnf_conf.j2
+    dest: "{{ dnf_conf_file }}"
+    mode: "0644"
+  when:
+    - "'dnf' in ansible_pkg_mgr"
+
+
+...

roles/dnf_conf/templates/dnf_conf.j2

@@ -0,0 +1,19 @@
+##########################
+# The Zen Garden Network #
+##########################
+#
+# Configuration    : {{ dnf_conf_file }}
+# Template Version : {{ dnf_conf_version}}-{{ dnf_conf_revision }}
+#
+# {{ dnf_conf_maintainer }} {{ dnf_conf_maintainer_email }}
+###############################################
+
+
+[main]
+gpgcheck={{ dnf_conf_gpg_check }}
+installonly_limit=3
+clean_requirements_on_remove=True
+best=True
+skip_if_unavailable=False
+max_parallel_downloads={{ dnf_conf_max_downloads }}
+fastestmirror={{ dnf_conf_fastest_mirror }}

roles/etc_hosts/meta/main.yml

@@ -6,7 +6,7 @@ galaxy_info:
 
   license: GPL-2.0-or-later
 
-  min_ansible_version: "2.14"
+  min_ansible_version: "2.14.0"
 
   platforms:
     - name: Fedora

roles/hostname/meta/main.yml

@@ -4,7 +4,7 @@ galaxy_info:
 
   license: GPL-2.0-or-later
 
-  min_ansible_version: "2.14"
+  min_ansible_version: "2.14.0"
 
   platforms:
     - name: Fedora

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:
@@ -9,32 +11,8 @@
         - "Restart_syslog_{{ ansible_distribution | lower }}_{{ ansible_distribution_major_version }}"
 
   rescue:
-    - name: Ensure hostname package is present
-      ansible.builtin.package:
-        name: hostname
-        state: present
-
-    - name: Set hostname file if running in container
-      ansible.builtin.set_fact:
-        hostname_hostname_file: "{{ hostname_hostname_file }}.container"
-      when:
-        - ansible_virtualization_type | regex_search("docker|podman|container")
-
-    - name: Add entry into hostname file
-      ansible.builtin.lineinfile:
-        path: "{{ hostname_hostname_file }}"
-        line: "{{ inventory_hostname }}"
-        state: present
-        create: true
-        mode: '0644'
-
-    - name: Update hostname from /etc/hostname
-      ansible.builtin.command:
-        cmd: "hostname -F {{ hostname_hostname_file }}"
-      notify:
-        - "Restart_syslog_{{ ansible_distribution | lower }}_{{ ansible_distribution_major_version }}"
-      when:
-        - not ansible_virtualization_type | regex_search("docker|podman|container")
-
+    - name: Unable to set hostname
+      ansible.builtin.debug:
+        msg: "Unable to set hostname for {{ ansible_hostname }} to {{ inventory_hostname }}."
 
 ...

roles/motd/defaults/main.yml

@@ -1,5 +1,13 @@
 ---
-motd_motd_file        : /etc/motd
+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/meta/main.yml

@@ -4,7 +4,7 @@ galaxy_info:
 
   license: GPL-2.0-or-later
 
-  min_ansible_version: "2.14"
+  min_ansible_version: "2.14.0"
 
   platforms:
     - name: Fedora

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,12 @@
 ---
-- name: Set host IP address or set a default
+- name: Format uptime using Jinja
   ansible.builtin.set_fact:
-    host_ip : "{{ ansible_default_ipv4.address | default('127.0.0.1') }}"
-
-
-- name: Install Perl if needed
-  ansible.builtin.package:
-    name  : perl
-    state : present
-
-
-- name: Get system uptime from script
-  ansible.builtin.script:
-    cmd        : "scripts/get_uptime.pl {{ ansible_uptime_seconds }}"
-  register     : node_uptime
-  changed_when : false
+    uptime_formatted: |
+      {% if '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) }}
+      {% endif %}
 
 
 - name: Update MOTD
@@ -26,4 +18,3 @@
 
 
 ...
-

roles/motd/templates/motd.j2

@@ -14,11 +14,11 @@
                   |___/
 
 
-Host     : {{ ansible_fqdn }}
-IP       : {{ host_ip }}
-CPU      : {{ ansible_processor_vcpus }} x {{ ansible_processor[2] }}
+Host     : {{ inventory_hostname }}
+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       : {{ node_uptime.stdout }}
+Up       : {{ 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_count : 3

roles/node_status/meta/main.yml

@@ -4,7 +4,7 @@ galaxy_info:
 
   license: GPL-2.0-or-later
 
-  min_ansible_version: "2.14"
+  min_ansible_version: "2.14.0"
 
   platforms:
     - name: Fedora

roles/node_status/tasks/main.yml

@@ -29,4 +29,5 @@
         owner     : "{{ node_status_user }}"
         group     : "{{ node_status_group }}"
       delegate_to : "{{ node_status_host }}"
-      loop: "{{ range(0, node_status_count) | list }}"
+      throttle    : 1
+

roles/resolv_conf/meta/main.yml

@@ -4,7 +4,7 @@ galaxy_info:
 
   license: GPL-2.0-or-later
 
-  min_ansible_version: "2.14"
+  min_ansible_version: "2.14.0"
 
   platforms:
     - name: Fedora

roles/snmpd_conf/meta/main.yml

@@ -4,7 +4,7 @@ galaxy_info:
 
   license: GPL-2.0-or-later
 
-  min_ansible_version: "2.14"
+  min_ansible_version: "2.14.0"
 
   platforms:
     - name: Fedora

roles/update_all_packages/meta/main.yml

@@ -4,7 +4,7 @@ galaxy_info:
 
   license: GPL-2.0-or-later
 
-  min_ansible_version: "2.14"
+  min_ansible_version: "2.14.0"
 
   platforms:
     - name: Fedora

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'
-  tags:
-    - skip_ansible_lint
+    - "'apt' in ansible_pkg_mgr"
 
 
 - name: Update package cache for RHEL/CentOS/Fedora hosts
-  dnf:
+  ansible.builtin.dnf:
     update_cache: true
   when:
-    - (ansible_distribution|lower == 'centos' or
-      ansible_distribution|lower == 'fedora' or
-      ansible_distribution|lower == 'redhat')
+    - "'dnf' in ansible_pkg_mgr"
     - ansible_distribution_major_version|int >= 8
-  tags:
-    - skip_ansible_lint
 
 
 - name: Update all host packages
-  package: name=* state=latest
-  tags:
-    - skip_ansible_lint
+  ansible.builtin.package: name=* state=latest
 
 
 ...