adjust "when" conditions to support RHEL8 naming

This commit is contained in:
Josh Lay 2020-01-07 00:37:06 -06:00
parent 50a8dc1248
commit 6f29a3904e
5 changed files with 8 additions and 8 deletions

View file

@ -26,7 +26,7 @@
with_items:
- libselinux-python
- sudo
when: ansible_distribution in ["CentOS", "Red Hat Enterprise Linux", "Fedora"] and not is_atomic
when: ansible_distribution in ["CentOS", "Red Hat Enterprise Linux", "RedHat", "Fedora"] and not is_atomic
- name: enable fastestmirror (fedora - non-atomic)
lineinfile:

View file

@ -4,7 +4,7 @@
when: ansible_distribution in ["Debian", "Ubuntu"]
- include_tasks: el.yml
when: ansible_distribution in ["CentOS", "Red Hat Enterprise Linux", "Fedora"]
when: ansible_distribution in ["CentOS", "Red Hat Enterprise Linux", "RedHat", "Fedora"]
- name: print generated password for {{ username }} on each host
debug: var=pwgen

View file

@ -4,7 +4,7 @@
package:
name: docker
state: latest
when: ansible_distribution in ["CentOS", "Fedora", "Red Hat Enterprise Linux"] and not is_atomic
when: ansible_distribution in ["CentOS", "Fedora", "Red Hat Enterprise Linux", "RedHat"] and not is_atomic
register: docker_installed
- name: add {{ username }} to 'dockerroot' group
@ -12,7 +12,7 @@
name: "{{ username }}"
groups: dockerroot
append: yes
when: ansible_distribution in ["CentOS", "Red Hat Enterprise Linux"] and not is_atomic
when: ansible_distribution in ["CentOS", "Red Hat Enterprise Linux", "RedHat"] and not is_atomic
- name: copy daemon.json
@ -22,11 +22,11 @@
owner: root
group: root
mode: 0644
when: ansible_distribution in ["CentOS", "Red Hat Enterprise Linux"] and not is_atomic
when: ansible_distribution in ["CentOS", "Red Hat Enterprise Linux", "RedHat"] and not is_atomic
- name: enable/start docker
service:
name: docker
state: started
enabled: yes
when: ansible_distribution in ["CentOS", "Fedora", "Red Hat Enterprise Linux"] and not is_atomic
when: ansible_distribution in ["CentOS", "Fedora", "Red Hat Enterprise Linux", "RedHat"] and not is_atomic

View file

@ -4,7 +4,7 @@
when: ansible_distribution in ["Debian", "Ubuntu"]
- include_tasks: el.yml
when: ansible_distribution in ["CentOS" , "Red Hat Enterprise Linux", "Fedora"] and not is_atomic
when: ansible_distribution in ["CentOS" , "Red Hat Enterprise Linux", "RedHat", "Fedora"] and not is_atomic
# Need an idempotent way to install packages on atomic
# command module isn't idempotent and the package module insists on installing containers.

View file

@ -19,7 +19,7 @@
package:
name: '*'
state: latest
when: ansible_distribution in ["CentOS", "Red Hat Enterprise Linux", "Debian", "Ubuntu"] and not is_atomic
when: ansible_distribution in ["CentOS", "Red Hat Enterprise Linux", "RedHat", "Debian", "Ubuntu"] and not is_atomic
register: host_upgraded
- name: reboot updated hosts