From d2118f40bbac864335ec75fe04ef386d8d56dd38 Mon Sep 17 00:00:00 2001 From: Jason Rothstein Date: Mon, 4 May 2026 22:23:31 -0500 Subject: [PATCH] Fix ansible core 2.20 and update supported OS list Signed-off-by: Jason Rothstein --- tasks/main.yml | 35 +++++++++++++++++---------------- vars/AlmaLinux-10-default.yml | 7 +++++++ vars/AlmaLinux-8-default.yml | 7 +++++++ vars/AlmaLinux-9-default.yml | 7 +++++++ vars/CentOS-10-default.yml | 7 +++++++ vars/CentOS-8-default.yml | 7 +++++++ vars/CentOS-9-default.yml | 7 +++++++ vars/Debian-11-default.yml | 7 +++++++ vars/Debian-12-default.yml | 7 +++++++ vars/Debian-13-default.yml | 7 +++++++ vars/Fedora-34-default.yml | 7 ------- vars/Fedora-35-default.yml | 7 ------- vars/Fedora-36-default.yml | 7 ------- vars/Fedora-37-default.yml | 7 ------- vars/Fedora-38-default.yml | 7 ------- vars/Fedora-39-default.yml | 7 ------- vars/Fedora-40-default.yml | 7 ------- vars/Fedora-41-default.yml | 7 ------- vars/Fedora-42-default.yml | 4 ++++ vars/Fedora-43-default.yml | 4 ++++ vars/Fedora-44-default.yml | 4 ++++ vars/OracleLinux-10-default.yml | 7 +++++++ vars/OracleLinux-8-default.yml | 7 +++++++ vars/OracleLinux-9-default.yml | 7 +++++++ vars/Rocky-10-default.yml | 7 +++++++ vars/Rocky-8-default.yml | 7 +++++++ vars/Rocky-9-default.yml | 7 +++++++ vars/Ubuntu-22-default.yml | 7 +++++++ vars/Ubuntu-24-default.yml | 7 +++++++ vars/Ubuntu-26-default.yml | 7 +++++++ 30 files changed, 156 insertions(+), 73 deletions(-) create mode 100644 vars/AlmaLinux-10-default.yml create mode 100644 vars/AlmaLinux-8-default.yml create mode 100644 vars/AlmaLinux-9-default.yml create mode 100644 vars/CentOS-10-default.yml create mode 100644 vars/CentOS-8-default.yml create mode 100644 vars/CentOS-9-default.yml create mode 100644 vars/Debian-11-default.yml create mode 100644 vars/Debian-12-default.yml create mode 100644 vars/Debian-13-default.yml delete mode 100644 vars/Fedora-34-default.yml delete mode 100644 vars/Fedora-35-default.yml delete mode 100644 vars/Fedora-36-default.yml delete mode 100644 vars/Fedora-37-default.yml delete mode 100644 vars/Fedora-38-default.yml delete mode 100644 vars/Fedora-39-default.yml delete mode 100644 vars/Fedora-40-default.yml delete mode 100644 vars/Fedora-41-default.yml create mode 100644 vars/OracleLinux-10-default.yml create mode 100644 vars/OracleLinux-8-default.yml create mode 100644 vars/OracleLinux-9-default.yml create mode 100644 vars/Rocky-10-default.yml create mode 100644 vars/Rocky-8-default.yml create mode 100644 vars/Rocky-9-default.yml create mode 100644 vars/Ubuntu-22-default.yml create mode 100644 vars/Ubuntu-24-default.yml create mode 100644 vars/Ubuntu-26-default.yml diff --git a/tasks/main.yml b/tasks/main.yml index 8bccf37..5dc3abf 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,36 +2,36 @@ # tasks file for ensure_vim - name: 'include variables' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' include_vars: file: '{{ lookup("first_found", findme ) }}' name: 'ensure_vim' vars: findme: files: - - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml' - - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-default.yml' - - '{{ ansible_distribution }}-default.yml' - - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml' - - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-default.yml' - - '{{ ansible_os_family }}-default.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["distribution"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml' + - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml' + - '{{ ansible_facts["os_family"] }}-default.yml' - 'default.yml' paths: - '../vars/' errors: 'ignore' - name: 'package discovery' when: - - ansible_system == 'Linux' - - packages is not defined + - ansible_facts["system"] == 'Linux' + - ansible_facts["packages"] is not defined ansible.builtin.package_facts: - name: 'service discovery' when: - - ansible_system == 'Linux' - - services is not defined + - ansible_facts["system"] == 'Linux' + - ansible_facts["services"] is not defined ansible.builtin.service_facts: - name: 'ensure packages' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_vim is defined - ensure_vim.package_list is defined - ensure_vim.package_list is iterable @@ -46,7 +46,7 @@ - 'ensure_vim.service_facts' - name: 'ensure configurations' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_vim is defined - ensure_vim.template_list is defined - ensure_vim.template_list is iterable @@ -71,7 +71,7 @@ - 'ensure_vim.service_restart' - name: 'ensure services' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_vim is defined - ensure_vim.service_list is defined - ensure_vim.service_list is iterable @@ -87,7 +87,7 @@ - 'ensure_vim.service_facts' - name: 'Ensure SELinux is configured' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_vim is defined - ensure_vim.selinux_policy is defined - ensure_vim.selinux_state is defined @@ -102,7 +102,7 @@ - 'ensure_vim.service_restart' - name: 'Reboot if required' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_vim is defined - ensure_vim.selinux_policy is defined - ensure_vim.selinux_state is defined @@ -112,7 +112,7 @@ reboot: - name: 'ensure seboolean' when: - - ansible_system == 'Linux' + - ansible_facts["system"] == 'Linux' - ensure_vim is defined - ensure_vim.seboolean_list is defined - ensure_vim.seboolean_list is iterable @@ -130,4 +130,5 @@ - 'ensure_vim.service_restart' - name: 'flush handlers' meta: 'flush_handlers' +... diff --git a/vars/AlmaLinux-10-default.yml b/vars/AlmaLinux-10-default.yml new file mode 100644 index 0000000..eb55ddf --- /dev/null +++ b/vars/AlmaLinux-10-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/AlmaLinux-8-default.yml b/vars/AlmaLinux-8-default.yml new file mode 100644 index 0000000..eb55ddf --- /dev/null +++ b/vars/AlmaLinux-8-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/AlmaLinux-9-default.yml b/vars/AlmaLinux-9-default.yml new file mode 100644 index 0000000..eb55ddf --- /dev/null +++ b/vars/AlmaLinux-9-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/CentOS-10-default.yml b/vars/CentOS-10-default.yml new file mode 100644 index 0000000..eb55ddf --- /dev/null +++ b/vars/CentOS-10-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/CentOS-8-default.yml b/vars/CentOS-8-default.yml new file mode 100644 index 0000000..eb55ddf --- /dev/null +++ b/vars/CentOS-8-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/CentOS-9-default.yml b/vars/CentOS-9-default.yml new file mode 100644 index 0000000..eb55ddf --- /dev/null +++ b/vars/CentOS-9-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/Debian-11-default.yml b/vars/Debian-11-default.yml new file mode 100644 index 0000000..79833f2 --- /dev/null +++ b/vars/Debian-11-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim' + state: 'present' +... + diff --git a/vars/Debian-12-default.yml b/vars/Debian-12-default.yml new file mode 100644 index 0000000..79833f2 --- /dev/null +++ b/vars/Debian-12-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim' + state: 'present' +... + diff --git a/vars/Debian-13-default.yml b/vars/Debian-13-default.yml new file mode 100644 index 0000000..79833f2 --- /dev/null +++ b/vars/Debian-13-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim' + state: 'present' +... + diff --git a/vars/Fedora-34-default.yml b/vars/Fedora-34-default.yml deleted file mode 100644 index ed68b57..0000000 --- a/vars/Fedora-34-default.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -# vars file for ensure_vim -package_list: - - name: 'nano-default-editor' - state: 'absent' - - name: 'vim-default-editor' - state: 'present' diff --git a/vars/Fedora-35-default.yml b/vars/Fedora-35-default.yml deleted file mode 100644 index ed68b57..0000000 --- a/vars/Fedora-35-default.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -# vars file for ensure_vim -package_list: - - name: 'nano-default-editor' - state: 'absent' - - name: 'vim-default-editor' - state: 'present' diff --git a/vars/Fedora-36-default.yml b/vars/Fedora-36-default.yml deleted file mode 100644 index ed68b57..0000000 --- a/vars/Fedora-36-default.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -# vars file for ensure_vim -package_list: - - name: 'nano-default-editor' - state: 'absent' - - name: 'vim-default-editor' - state: 'present' diff --git a/vars/Fedora-37-default.yml b/vars/Fedora-37-default.yml deleted file mode 100644 index ed68b57..0000000 --- a/vars/Fedora-37-default.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -# vars file for ensure_vim -package_list: - - name: 'nano-default-editor' - state: 'absent' - - name: 'vim-default-editor' - state: 'present' diff --git a/vars/Fedora-38-default.yml b/vars/Fedora-38-default.yml deleted file mode 100644 index ed68b57..0000000 --- a/vars/Fedora-38-default.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -# vars file for ensure_vim -package_list: - - name: 'nano-default-editor' - state: 'absent' - - name: 'vim-default-editor' - state: 'present' diff --git a/vars/Fedora-39-default.yml b/vars/Fedora-39-default.yml deleted file mode 100644 index ed68b57..0000000 --- a/vars/Fedora-39-default.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -# vars file for ensure_vim -package_list: - - name: 'nano-default-editor' - state: 'absent' - - name: 'vim-default-editor' - state: 'present' diff --git a/vars/Fedora-40-default.yml b/vars/Fedora-40-default.yml deleted file mode 100644 index ed68b57..0000000 --- a/vars/Fedora-40-default.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -# vars file for ensure_vim -package_list: - - name: 'nano-default-editor' - state: 'absent' - - name: 'vim-default-editor' - state: 'present' diff --git a/vars/Fedora-41-default.yml b/vars/Fedora-41-default.yml deleted file mode 100644 index ed68b57..0000000 --- a/vars/Fedora-41-default.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -# vars file for ensure_vim -package_list: - - name: 'nano-default-editor' - state: 'absent' - - name: 'vim-default-editor' - state: 'present' diff --git a/vars/Fedora-42-default.yml b/vars/Fedora-42-default.yml index ed68b57..72bd0ad 100644 --- a/vars/Fedora-42-default.yml +++ b/vars/Fedora-42-default.yml @@ -5,3 +5,7 @@ package_list: state: 'absent' - name: 'vim-default-editor' state: 'present' + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/Fedora-43-default.yml b/vars/Fedora-43-default.yml index ed68b57..72bd0ad 100644 --- a/vars/Fedora-43-default.yml +++ b/vars/Fedora-43-default.yml @@ -5,3 +5,7 @@ package_list: state: 'absent' - name: 'vim-default-editor' state: 'present' + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/Fedora-44-default.yml b/vars/Fedora-44-default.yml index ed68b57..72bd0ad 100644 --- a/vars/Fedora-44-default.yml +++ b/vars/Fedora-44-default.yml @@ -5,3 +5,7 @@ package_list: state: 'absent' - name: 'vim-default-editor' state: 'present' + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/OracleLinux-10-default.yml b/vars/OracleLinux-10-default.yml new file mode 100644 index 0000000..eb55ddf --- /dev/null +++ b/vars/OracleLinux-10-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/OracleLinux-8-default.yml b/vars/OracleLinux-8-default.yml new file mode 100644 index 0000000..eb55ddf --- /dev/null +++ b/vars/OracleLinux-8-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/OracleLinux-9-default.yml b/vars/OracleLinux-9-default.yml new file mode 100644 index 0000000..eb55ddf --- /dev/null +++ b/vars/OracleLinux-9-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/Rocky-10-default.yml b/vars/Rocky-10-default.yml new file mode 100644 index 0000000..eb55ddf --- /dev/null +++ b/vars/Rocky-10-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/Rocky-8-default.yml b/vars/Rocky-8-default.yml new file mode 100644 index 0000000..eb55ddf --- /dev/null +++ b/vars/Rocky-8-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/Rocky-9-default.yml b/vars/Rocky-9-default.yml new file mode 100644 index 0000000..eb55ddf --- /dev/null +++ b/vars/Rocky-9-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim-enhanced' + state: 'present' +... + diff --git a/vars/Ubuntu-22-default.yml b/vars/Ubuntu-22-default.yml new file mode 100644 index 0000000..79833f2 --- /dev/null +++ b/vars/Ubuntu-22-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim' + state: 'present' +... + diff --git a/vars/Ubuntu-24-default.yml b/vars/Ubuntu-24-default.yml new file mode 100644 index 0000000..79833f2 --- /dev/null +++ b/vars/Ubuntu-24-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim' + state: 'present' +... + diff --git a/vars/Ubuntu-26-default.yml b/vars/Ubuntu-26-default.yml new file mode 100644 index 0000000..79833f2 --- /dev/null +++ b/vars/Ubuntu-26-default.yml @@ -0,0 +1,7 @@ +--- +# vars file for ensure_vim +package_list: + - name: 'vim' + state: 'present' +... +