update ansible_distribution_major_version conditionals

Signed-off-by: Karsten Hopp <karsten@redhat.com>
This commit is contained in:
Karsten Hopp 2019-09-02 12:14:18 +02:00 committed by Pierre-Yves Chibon
parent d982c06fde
commit c9ed62ac32
45 changed files with 460 additions and 175 deletions

View file

@ -3,13 +3,19 @@
package: name=pam_url state=present
tags:
- packages
when: ansible_distribution_major_version|int < 22
when: ansible_distribution_major_version|int < 8 and ansible_distribution is 'RedHat'
- name: install pam_url
dnf: name=pam_url state=present
tags:
- packages
when: ansible_distribution_major_version|int > 21
when: ansible_distribution_major_version|int > 7 and ansible_distribution is 'RedHat'
- name: install pam_url
dnf: name=pam_url state=present
tags:
- packages
when: ansible_distribution_major_version|int >= 29 and ansible_distribution is 'RedHat'
- name: /etc/pki/tls/private/totpcgi.pem
copy: src="{{ private }}/files/2fa-certs/keys/{{ inventory_hostname }}.pem" dest=/etc/pki/tls/private/totpcgi.pem mode=0400

View file

@ -6,7 +6,7 @@
- ntp
- libsemanage-python
- libselinux-python
when: ansible_distribution_major_version|int < 22
when: ansible_distribution_major_version|int < 8 and ansible_distribution is 'RedHat'
tags:
- packages
@ -15,7 +15,16 @@
with_items:
- ntpdate
- libselinux-python
when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined
when: ansible_distribution_major_version|int > 7 and ansible_distribution is 'RedHat' and ansible_cmdline.ostree is not defined
tags:
- packages
- name: Install desired extra packages (dnf)
dnf: state=present pkg={{ item }}
with_items:
- ntpdate
- libselinux-python
when: ansible_distribution_major_version|int >=29 and ansible_distribution is 'Fedora' and ansible_cmdline.ostree is not defined
tags:
- packages
@ -57,14 +66,21 @@
- name: update all
command: yum -y update creates=/etc/sysconfig/global-update-applied
register: updated
when: ansible_distribution_major_version|int < 22
when: ansible_distribution_major_version|int < 8 and ansible_distribution is 'RedHat'
tags:
- packages
- name: update all
command: dnf -y update creates=/etc/sysconfig/global-update-applied
register: updated
when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined
when: ansible_distribution_major_version|int > 7 and ansible_distribution is 'RedHat' and ansible_cmdline.ostree is not defined
tags:
- packages
- name: update all
command: dnf -y update creates=/etc/sysconfig/global-update-applied
register: updated
when: ansible_distribution_major_version|int >= 29 and ansible_distribution is 'Fedora' and ansible_cmdline.ostree is not defined
tags:
- packages

View file

@ -88,16 +88,8 @@
- yumrepos
- name: add aarch64 server rpms repo
copy: src="{{ files }}/common/rhel-7-aarch64-server-rpms.repo" dest="/etc/yum.repos.d/rhel-7-aarch64-server-rpms.repo"
when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') and inventory_hostname.startswith('aarch64-c') and ansible_distribution_major_version == 7
tags:
- config
- packages
- yumrepos
- name: add aarch64 server rpms repo
copy: src="{{ files }}/common/rhel-8-aarch64-server-rpms.repo" dest="/etc/yum.repos.d/rhel-8-aarch64-server-rpms.repo"
when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') and inventory_hostname.startswith('aarch64-c') and ansible_distribution_major_version == 8
copy: src="{{ files }}/common/rhel-{{ ansible_distribution_major_version }}-aarch64-server-rpms.repo" dest="/etc/yum.repos.d/rhel-{{ ansible_distribution_major_version }}-aarch64-server-rpms.repo"
when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') and inventory_hostname.startswith('aarch64-c') and ansible_distribution_major_version >= 7
tags:
- config
- packages