diff --git a/README.md b/README.md index abb0aea..25cdd5c 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ Not able to set time in rhel8 due to bug in rhel8 Version ------- +* `4.0.0` --- Updated for ansible-core 2.16. Removed support for Ubuntu Xenial and Ubuntu Bionic. * `3.2.0` --- Added Ubuntu Noble support * `3.1.3` --- Allow Fedora CoreOS 39 * `3.1.2` --- fix checkmode @@ -44,13 +45,12 @@ This role is limited to * Ubuntu 24.04 - Noble * Ubuntu 22.04 - Jammy * Ubuntu 20.04 - Focal -* Ubuntu 18.04 - Bionic -* Ubuntu 16.04 - Xenial * CentOS 7 * CentOS Stream 8 * RHEL 8 * RHEL 9 * Fedora CoreOS 38 +* Fedora CoreOS 39 Role Variables -------------- @@ -136,7 +136,7 @@ GPLv2 Author Information ------------------ -Created 2020 by [Arnulf Heimsbakk](mailto:arnulf.heimsbakk@met.no) for MET Norway. -Modified 2022 by [Silje Amundsen](mailto:siljeba@met.no) for MET Norway. +Created 2020 by IT Infrastructure at MET Norway +Contactpoint: [IT Infrastructure Basis Team](mailto:it-is-basis@met.no) ###### set vim: spell spelllang=en: diff --git a/meta/main.yml b/meta/main.yml index 0545c3b..4ee573e 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -9,7 +9,7 @@ galaxy_info: license: GPLv2 - min_ansible_version: "2.12" + min_ansible_version: "2.16" platforms: - name: Ubuntu @@ -17,8 +17,6 @@ galaxy_info: - "noble" - "jammy" - "focal" - - "bionic" - - "xenial" - name: EL versions: - "7" diff --git a/tasks/main.yml b/tasks/main.yml index 02c8903..b69f000 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,11 +2,11 @@ --- - name: Check if we are running supported os ansible.builtin.assert: - fail_msg: "{{ role_name }} only supports ubuntu versions 16, 18, 20, 22, 24, centos versions 7, and RHEL version 8!" + fail_msg: "{{ role_name }} only supports ubuntu versions 20, 22, 24, centos versions 7, and RHEL version 8!" success_msg: "{{ role_name }} supports {{ ansible_distribution }} version {{ ansible_distribution_version }}" quiet: "{{ not ansible_check_mode }}" that: - ( ansible_distribution|lower == "ubuntu" and ansible_distribution_version|int in [16, 18, 20, 22, 24] ) + ( ansible_distribution|lower == "ubuntu" and ansible_distribution_version|int in [20, 22, 24] ) or ( ansible_distribution|lower == "centos" and ansible_distribution_major_version|int in [7, 8] ) or ( ansible_distribution|lower == "redhat" and ansible_distribution_major_version|int in [8, 9] ) or ( ansible_distribution|lower == "fedora" and ansible_distribution_major_version|int in [38, 39] ) @@ -45,8 +45,6 @@ - name: Check ntpd is running ansible.builtin.shell: | pgrep ntpd - args: - warn: false register: ntpd_running changed_when: ntpd_running.rc == 0 failed_when: false diff --git a/tests/Vagrantfile b/tests/Vagrantfile index c13c88d..44c81f3 100644 --- a/tests/Vagrantfile +++ b/tests/Vagrantfile @@ -8,8 +8,6 @@ Vagrant.configure("2") do |config| { :name => "noble", :box => "ubuntu/noble64" }, { :name => "jammy", :box => "ubuntu/jammy64" }, { :name => "focal", :box => "ubuntu/focal64" }, - { :name => "bionic", :box => "ubuntu/bionic64" }, - { :name => "xenial", :box => "ubuntu/xenial64" }, { :name => "centos7", :box => "centos/7" }, { :name => "centos8", :box => "generic/centos8s" }, { :name => "rhel8", :box => "generic/rhel8" },