Fix up base role so it works on f22 machines with dnf module.
This commit is contained in:
parent
b846bf60fa
commit
54ab78ac4a
1 changed files with 33 additions and 3 deletions
|
@ -19,13 +19,23 @@
|
||||||
- resolvconf
|
- resolvconf
|
||||||
- base
|
- base
|
||||||
|
|
||||||
- name: global default packages to install
|
- name: global default packages to install (yum)
|
||||||
yum: state=present name={{ item }}
|
yum: state=present name={{ item }}
|
||||||
with_items:
|
with_items:
|
||||||
- "{{ global_pkgs_inst }}"
|
- "{{ global_pkgs_inst }}"
|
||||||
tags:
|
tags:
|
||||||
- packages
|
- packages
|
||||||
- base
|
- base
|
||||||
|
when: ansible_distribution_major_version|int < 22
|
||||||
|
|
||||||
|
- name: global default packages to install (dnf)
|
||||||
|
dnf: state=present name={{ item }}
|
||||||
|
with_items:
|
||||||
|
- "{{ global_pkgs_inst }}"
|
||||||
|
tags:
|
||||||
|
- packages
|
||||||
|
- base
|
||||||
|
when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined
|
||||||
|
|
||||||
- debug: msg="{{ansible_nodename}} {{inventory_hostname}} {{ansible_distribution_major_version|int}}"
|
- debug: msg="{{ansible_nodename}} {{inventory_hostname}} {{ansible_distribution_major_version|int}}"
|
||||||
|
|
||||||
|
@ -72,21 +82,41 @@
|
||||||
- config
|
- config
|
||||||
- base
|
- base
|
||||||
|
|
||||||
- name: dist pkgs to remove
|
- name: dist pkgs to remove (yum)
|
||||||
yum: state=absent name={{ item }}
|
yum: state=absent name={{ item }}
|
||||||
with_items:
|
with_items:
|
||||||
- "{{ base_pkgs_erase }}"
|
- "{{ base_pkgs_erase }}"
|
||||||
tags:
|
tags:
|
||||||
- packages
|
- packages
|
||||||
- base
|
- base
|
||||||
|
when: ansible_distribution_major_version|int < 22
|
||||||
|
|
||||||
- name: dist pkgs to install
|
- name: dist pkgs to install (yum)
|
||||||
yum: state=present name={{ item }}
|
yum: state=present name={{ item }}
|
||||||
with_items:
|
with_items:
|
||||||
- "{{ base_pkgs_inst }}"
|
- "{{ base_pkgs_inst }}"
|
||||||
tags:
|
tags:
|
||||||
- packages
|
- packages
|
||||||
- base
|
- base
|
||||||
|
when: ansible_distribution_major_version|int < 22
|
||||||
|
|
||||||
|
- name: dist pkgs to remove (dnf)
|
||||||
|
dnf: state=absent name={{ item }}
|
||||||
|
with_items:
|
||||||
|
- "{{ base_pkgs_erase }}"
|
||||||
|
tags:
|
||||||
|
- packages
|
||||||
|
- base
|
||||||
|
when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined
|
||||||
|
|
||||||
|
- name: dist pkgs to install (dnf)
|
||||||
|
dnf: state=present name={{ item }}
|
||||||
|
with_items:
|
||||||
|
- "{{ base_pkgs_inst }}"
|
||||||
|
tags:
|
||||||
|
- packages
|
||||||
|
- base
|
||||||
|
when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined
|
||||||
|
|
||||||
- name: dist disabled services
|
- name: dist disabled services
|
||||||
service: state=stopped enabled=false name={{ item }}
|
service: state=stopped enabled=false name={{ item }}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue