Fix ansible core 2.20 and update supported OS list
Signed-off-by: Jason Rothstein <fdragon@fdragon.org>
This commit is contained in:
+18
-17
@@ -2,36 +2,36 @@
|
|||||||
# tasks file for ensure_vim
|
# tasks file for ensure_vim
|
||||||
- name: 'include variables'
|
- name: 'include variables'
|
||||||
when:
|
when:
|
||||||
- ansible_system == 'Linux'
|
- ansible_facts["system"] == 'Linux'
|
||||||
include_vars:
|
include_vars:
|
||||||
file: '{{ lookup("first_found", findme ) }}'
|
file: '{{ lookup("first_found", findme ) }}'
|
||||||
name: 'ensure_vim'
|
name: 'ensure_vim'
|
||||||
vars:
|
vars:
|
||||||
findme:
|
findme:
|
||||||
files:
|
files:
|
||||||
- '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml'
|
- '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml'
|
||||||
- '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-default.yml'
|
- '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml'
|
||||||
- '{{ ansible_distribution }}-default.yml'
|
- '{{ ansible_facts["distribution"] }}-default.yml'
|
||||||
- '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml'
|
- '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml'
|
||||||
- '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-default.yml'
|
- '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml'
|
||||||
- '{{ ansible_os_family }}-default.yml'
|
- '{{ ansible_facts["os_family"] }}-default.yml'
|
||||||
- 'default.yml'
|
- 'default.yml'
|
||||||
paths:
|
paths:
|
||||||
- '../vars/'
|
- '../vars/'
|
||||||
errors: 'ignore'
|
errors: 'ignore'
|
||||||
- name: 'package discovery'
|
- name: 'package discovery'
|
||||||
when:
|
when:
|
||||||
- ansible_system == 'Linux'
|
- ansible_facts["system"] == 'Linux'
|
||||||
- packages is not defined
|
- ansible_facts["packages"] is not defined
|
||||||
ansible.builtin.package_facts:
|
ansible.builtin.package_facts:
|
||||||
- name: 'service discovery'
|
- name: 'service discovery'
|
||||||
when:
|
when:
|
||||||
- ansible_system == 'Linux'
|
- ansible_facts["system"] == 'Linux'
|
||||||
- services is not defined
|
- ansible_facts["services"] is not defined
|
||||||
ansible.builtin.service_facts:
|
ansible.builtin.service_facts:
|
||||||
- name: 'ensure packages'
|
- name: 'ensure packages'
|
||||||
when:
|
when:
|
||||||
- ansible_system == 'Linux'
|
- ansible_facts["system"] == 'Linux'
|
||||||
- ensure_vim is defined
|
- ensure_vim is defined
|
||||||
- ensure_vim.package_list is defined
|
- ensure_vim.package_list is defined
|
||||||
- ensure_vim.package_list is iterable
|
- ensure_vim.package_list is iterable
|
||||||
@@ -46,7 +46,7 @@
|
|||||||
- 'ensure_vim.service_facts'
|
- 'ensure_vim.service_facts'
|
||||||
- name: 'ensure configurations'
|
- name: 'ensure configurations'
|
||||||
when:
|
when:
|
||||||
- ansible_system == 'Linux'
|
- ansible_facts["system"] == 'Linux'
|
||||||
- ensure_vim is defined
|
- ensure_vim is defined
|
||||||
- ensure_vim.template_list is defined
|
- ensure_vim.template_list is defined
|
||||||
- ensure_vim.template_list is iterable
|
- ensure_vim.template_list is iterable
|
||||||
@@ -71,7 +71,7 @@
|
|||||||
- 'ensure_vim.service_restart'
|
- 'ensure_vim.service_restart'
|
||||||
- name: 'ensure services'
|
- name: 'ensure services'
|
||||||
when:
|
when:
|
||||||
- ansible_system == 'Linux'
|
- ansible_facts["system"] == 'Linux'
|
||||||
- ensure_vim is defined
|
- ensure_vim is defined
|
||||||
- ensure_vim.service_list is defined
|
- ensure_vim.service_list is defined
|
||||||
- ensure_vim.service_list is iterable
|
- ensure_vim.service_list is iterable
|
||||||
@@ -87,7 +87,7 @@
|
|||||||
- 'ensure_vim.service_facts'
|
- 'ensure_vim.service_facts'
|
||||||
- name: 'Ensure SELinux is configured'
|
- name: 'Ensure SELinux is configured'
|
||||||
when:
|
when:
|
||||||
- ansible_system == 'Linux'
|
- ansible_facts["system"] == 'Linux'
|
||||||
- ensure_vim is defined
|
- ensure_vim is defined
|
||||||
- ensure_vim.selinux_policy is defined
|
- ensure_vim.selinux_policy is defined
|
||||||
- ensure_vim.selinux_state is defined
|
- ensure_vim.selinux_state is defined
|
||||||
@@ -102,7 +102,7 @@
|
|||||||
- 'ensure_vim.service_restart'
|
- 'ensure_vim.service_restart'
|
||||||
- name: 'Reboot if required'
|
- name: 'Reboot if required'
|
||||||
when:
|
when:
|
||||||
- ansible_system == 'Linux'
|
- ansible_facts["system"] == 'Linux'
|
||||||
- ensure_vim is defined
|
- ensure_vim is defined
|
||||||
- ensure_vim.selinux_policy is defined
|
- ensure_vim.selinux_policy is defined
|
||||||
- ensure_vim.selinux_state is defined
|
- ensure_vim.selinux_state is defined
|
||||||
@@ -112,7 +112,7 @@
|
|||||||
reboot:
|
reboot:
|
||||||
- name: 'ensure seboolean'
|
- name: 'ensure seboolean'
|
||||||
when:
|
when:
|
||||||
- ansible_system == 'Linux'
|
- ansible_facts["system"] == 'Linux'
|
||||||
- ensure_vim is defined
|
- ensure_vim is defined
|
||||||
- ensure_vim.seboolean_list is defined
|
- ensure_vim.seboolean_list is defined
|
||||||
- ensure_vim.seboolean_list is iterable
|
- ensure_vim.seboolean_list is iterable
|
||||||
@@ -130,4 +130,5 @@
|
|||||||
- 'ensure_vim.service_restart'
|
- 'ensure_vim.service_restart'
|
||||||
- name: 'flush handlers'
|
- name: 'flush handlers'
|
||||||
meta: 'flush_handlers'
|
meta: 'flush_handlers'
|
||||||
|
...
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
# vars file for ensure_vim
|
||||||
|
package_list:
|
||||||
|
- name: 'vim-enhanced'
|
||||||
|
state: 'present'
|
||||||
|
...
|
||||||
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
# vars file for ensure_vim
|
||||||
|
package_list:
|
||||||
|
- name: 'vim-enhanced'
|
||||||
|
state: 'present'
|
||||||
|
...
|
||||||
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
# vars file for ensure_vim
|
||||||
|
package_list:
|
||||||
|
- name: 'vim-enhanced'
|
||||||
|
state: 'present'
|
||||||
|
...
|
||||||
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
# vars file for ensure_vim
|
||||||
|
package_list:
|
||||||
|
- name: 'vim-enhanced'
|
||||||
|
state: 'present'
|
||||||
|
...
|
||||||
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
# vars file for ensure_vim
|
||||||
|
package_list:
|
||||||
|
- name: 'vim-enhanced'
|
||||||
|
state: 'present'
|
||||||
|
...
|
||||||
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
# vars file for ensure_vim
|
||||||
|
package_list:
|
||||||
|
- name: 'vim-enhanced'
|
||||||
|
state: 'present'
|
||||||
|
...
|
||||||
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
# vars file for ensure_vim
|
||||||
|
package_list:
|
||||||
|
- name: 'vim'
|
||||||
|
state: 'present'
|
||||||
|
...
|
||||||
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
# vars file for ensure_vim
|
||||||
|
package_list:
|
||||||
|
- name: 'vim'
|
||||||
|
state: 'present'
|
||||||
|
...
|
||||||
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
# vars file for ensure_vim
|
||||||
|
package_list:
|
||||||
|
- name: 'vim'
|
||||||
|
state: 'present'
|
||||||
|
...
|
||||||
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
---
|
|
||||||
# vars file for ensure_vim
|
|
||||||
package_list:
|
|
||||||
- name: 'nano-default-editor'
|
|
||||||
state: 'absent'
|
|
||||||
- name: 'vim-default-editor'
|
|
||||||
state: 'present'
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
---
|
|
||||||
# vars file for ensure_vim
|
|
||||||
package_list:
|
|
||||||
- name: 'nano-default-editor'
|
|
||||||
state: 'absent'
|
|
||||||
- name: 'vim-default-editor'
|
|
||||||
state: 'present'
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
---
|
|
||||||
# vars file for ensure_vim
|
|
||||||
package_list:
|
|
||||||
- name: 'nano-default-editor'
|
|
||||||
state: 'absent'
|
|
||||||
- name: 'vim-default-editor'
|
|
||||||
state: 'present'
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
---
|
|
||||||
# vars file for ensure_vim
|
|
||||||
package_list:
|
|
||||||
- name: 'nano-default-editor'
|
|
||||||
state: 'absent'
|
|
||||||
- name: 'vim-default-editor'
|
|
||||||
state: 'present'
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
---
|
|
||||||
# vars file for ensure_vim
|
|
||||||
package_list:
|
|
||||||
- name: 'nano-default-editor'
|
|
||||||
state: 'absent'
|
|
||||||
- name: 'vim-default-editor'
|
|
||||||
state: 'present'
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
---
|
|
||||||
# vars file for ensure_vim
|
|
||||||
package_list:
|
|
||||||
- name: 'nano-default-editor'
|
|
||||||
state: 'absent'
|
|
||||||
- name: 'vim-default-editor'
|
|
||||||
state: 'present'
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
---
|
|
||||||
# vars file for ensure_vim
|
|
||||||
package_list:
|
|
||||||
- name: 'nano-default-editor'
|
|
||||||
state: 'absent'
|
|
||||||
- name: 'vim-default-editor'
|
|
||||||
state: 'present'
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
---
|
|
||||||
# vars file for ensure_vim
|
|
||||||
package_list:
|
|
||||||
- name: 'nano-default-editor'
|
|
||||||
state: 'absent'
|
|
||||||
- name: 'vim-default-editor'
|
|
||||||
state: 'present'
|
|
||||||
@@ -5,3 +5,7 @@ package_list:
|
|||||||
state: 'absent'
|
state: 'absent'
|
||||||
- name: 'vim-default-editor'
|
- name: 'vim-default-editor'
|
||||||
state: 'present'
|
state: 'present'
|
||||||
|
- name: 'vim-enhanced'
|
||||||
|
state: 'present'
|
||||||
|
...
|
||||||
|
|
||||||
|
|||||||
@@ -5,3 +5,7 @@ package_list:
|
|||||||
state: 'absent'
|
state: 'absent'
|
||||||
- name: 'vim-default-editor'
|
- name: 'vim-default-editor'
|
||||||
state: 'present'
|
state: 'present'
|
||||||
|
- name: 'vim-enhanced'
|
||||||
|
state: 'present'
|
||||||
|
...
|
||||||
|
|
||||||
|
|||||||
@@ -5,3 +5,7 @@ package_list:
|
|||||||
state: 'absent'
|
state: 'absent'
|
||||||
- name: 'vim-default-editor'
|
- name: 'vim-default-editor'
|
||||||
state: 'present'
|
state: 'present'
|
||||||
|
- name: 'vim-enhanced'
|
||||||
|
state: 'present'
|
||||||
|
...
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
# vars file for ensure_vim
|
||||||
|
package_list:
|
||||||
|
- name: 'vim-enhanced'
|
||||||
|
state: 'present'
|
||||||
|
...
|
||||||
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
# vars file for ensure_vim
|
||||||
|
package_list:
|
||||||
|
- name: 'vim-enhanced'
|
||||||
|
state: 'present'
|
||||||
|
...
|
||||||
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
# vars file for ensure_vim
|
||||||
|
package_list:
|
||||||
|
- name: 'vim-enhanced'
|
||||||
|
state: 'present'
|
||||||
|
...
|
||||||
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
# vars file for ensure_vim
|
||||||
|
package_list:
|
||||||
|
- name: 'vim-enhanced'
|
||||||
|
state: 'present'
|
||||||
|
...
|
||||||
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
# vars file for ensure_vim
|
||||||
|
package_list:
|
||||||
|
- name: 'vim-enhanced'
|
||||||
|
state: 'present'
|
||||||
|
...
|
||||||
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
# vars file for ensure_vim
|
||||||
|
package_list:
|
||||||
|
- name: 'vim-enhanced'
|
||||||
|
state: 'present'
|
||||||
|
...
|
||||||
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
# vars file for ensure_vim
|
||||||
|
package_list:
|
||||||
|
- name: 'vim'
|
||||||
|
state: 'present'
|
||||||
|
...
|
||||||
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
# vars file for ensure_vim
|
||||||
|
package_list:
|
||||||
|
- name: 'vim'
|
||||||
|
state: 'present'
|
||||||
|
...
|
||||||
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
# vars file for ensure_vim
|
||||||
|
package_list:
|
||||||
|
- name: 'vim'
|
||||||
|
state: 'present'
|
||||||
|
...
|
||||||
|
|
||||||
Reference in New Issue
Block a user