diff --git a/galaxy.yml b/galaxy.yml index fb1c27b..ab99659 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.5 +version: 1.0.6 # 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/base_packages/tasks/main.yml b/roles/base_packages/tasks/main.yml index 6e0bc69..b7cb015 100644 --- a/roles/base_packages/tasks/main.yml +++ b/roles/base_packages/tasks/main.yml @@ -3,7 +3,8 @@ block: - name: Include distribution specific variables include_vars: - file: "{{ ansible_distribution | regex_replace('\\s+', '_') | lower }}_{{ ansible_distribution_major_version }}.yml" + file: "{{ ansible_distribution | lower }}_{{ ansible_distribution_major_version }}.yml" + rescue: - name: Non-supported distribution; using default package set @@ -11,6 +12,14 @@ file: __default_packages.yml +- name: Install EPEL for CentOS hosts - Required for some of our packages + package: + name : epel-release + state : present + when: + - ansible_distribution | lower == 'centos' + + - name: Install package set package: name : "{{ __base_packages }}" diff --git a/roles/base_packages/vars/centos_7.yml b/roles/base_packages/vars/centos_7.yml index 0a917b0..4436738 100644 --- a/roles/base_packages/vars/centos_7.yml +++ b/roles/base_packages/vars/centos_7.yml @@ -9,7 +9,6 @@ __base_packages: - ftp - git - htop - - ipa-client - iperf - iptraf - jwhois diff --git a/roles/base_packages/vars/centos_8.yml b/roles/base_packages/vars/centos_8.yml index 35a98a5..35952ca 100644 --- a/roles/base_packages/vars/centos_8.yml +++ b/roles/base_packages/vars/centos_8.yml @@ -10,7 +10,6 @@ __base_packages: - ftp - git - htop - - ipa-client - iperf3 - iptraf - lsof diff --git a/roles/base_packages/vars/centos_9.yml b/roles/base_packages/vars/centos_9.yml index e23a06f..9057f92 100644 --- a/roles/base_packages/vars/centos_9.yml +++ b/roles/base_packages/vars/centos_9.yml @@ -9,7 +9,6 @@ __base_packages: - ftp - git - htop - - ipa-client - iperf3 - iptraf - lsof diff --git a/roles/base_packages/vars/opensuse_tumbleweed_20220324.yml b/roles/base_packages/vars/opensuse_tumbleweed_20220324.yml deleted file mode 100644 index 8eeae2c..0000000 --- a/roles/base_packages/vars/opensuse_tumbleweed_20220324.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -__base_packages: - - bc - - bzip2 - - file - - ftp - - git - - iptraf - - mlocate - - lsof - - rsync - - sudo - - tar - - tcpdump - - telnet - - traceroute - - tree - - unzip - - wget - - whois - - zip - diff --git a/roles/motd/tasks/main.yml b/roles/motd/tasks/main.yml index f2efce6..43ab06f 100644 --- a/roles/motd/tasks/main.yml +++ b/roles/motd/tasks/main.yml @@ -1,21 +1,29 @@ --- - name: Set host IP address or set a default set_fact: - host_ip: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" + host_ip : "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" -- name: Get system uptime - Script - script: "scripts/get_uptime.pl {{ ansible_uptime_seconds }}" - register: node_uptime - changed_when: false +- name: Install Perl if needed + package: + name : perl + state : present + + +- name: Get system uptime from script + script: + cmd : "scripts/get_uptime.pl {{ ansible_uptime_seconds }}" + register : node_uptime + changed_when : false - name: Update MOTD template: - src: templates/motd.j2 - dest: "{{ __motd_file }}" - mode: 0644 - changed_when: false + src : templates/motd.j2 + dest : "{{ __motd_file }}" + mode : 0644 + changed_when : false ... + diff --git a/roles/resolv_conf/defaults/main.yml b/roles/resolv_conf/defaults/main.yml index a47b8ee..fd253c3 100644 --- a/roles/resolv_conf/defaults/main.yml +++ b/roles/resolv_conf/defaults/main.yml @@ -9,14 +9,14 @@ __template_header : The Zen Garden __resolv_conf_file : /etc/resolv.conf __resolv_conf_file_docker : /etc/resolv.conf.docker -__resolv_conf_version : 1.0.0 -__resolv_conf_revision : 22315 +__resolv_conf_version : 1.0.1 +__resolv_conf_revision : 221007 __search_domain : thezengarden.net __nameservers : - 10.10.10.55 - - 10.1.1.210 + - 10.1.1.15 ... diff --git a/roles/resolv_conf/templates/resolv_conf.j2 b/roles/resolv_conf/templates/resolv_conf.j2 index 91b490d..e078f86 100644 --- a/roles/resolv_conf/templates/resolv_conf.j2 +++ b/roles/resolv_conf/templates/resolv_conf.j2 @@ -1,4 +1,3 @@ -############################################### # {{ __template_header }} ############################################### # diff --git a/roles/snmpd_conf/tasks/main.yml b/roles/snmpd_conf/tasks/main.yml index 555d1d4..35b15f7 100644 --- a/roles/snmpd_conf/tasks/main.yml +++ b/roles/snmpd_conf/tasks/main.yml @@ -9,7 +9,7 @@ rescue: - name: Non-supported distribution; using default package set include_vars: - file: __defaults.yml + file: __default_packages.yml - name: Deploy and configure SNMP diff --git a/roles/snmpd_conf/vars/__defaults.yml b/roles/snmpd_conf/vars/__default_packages.yml similarity index 100% rename from roles/snmpd_conf/vars/__defaults.yml rename to roles/snmpd_conf/vars/__default_packages.yml diff --git a/roles/update_all_packages/tasks/main.yml b/roles/update_all_packages/tasks/main.yml index 45f391b..66d25e8 100644 --- a/roles/update_all_packages/tasks/main.yml +++ b/roles/update_all_packages/tasks/main.yml @@ -1,5 +1,26 @@ --- -- name: Update all packages on host +- name: Update package cache for Debian hosts + apt: + update_cache: yes + when: + - ansible_distribution|lower == 'debian' + tags: + - skip_ansible_lint + + +- name: Update package cache for RHEL/CentOS/Fedora hosts + dnf: + update_cache: yes + when: + - (ansible_distribution|lower == 'centos' or + 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 tags: - skip_ansible_lint