From 6f29a3904eed109e0513192b9e6cfa6423772fc6 Mon Sep 17 00:00:00 2001 From: Josh Lay Date: Tue, 7 Jan 2020 00:37:06 -0600 Subject: [PATCH] adjust "when" conditions to support RHEL8 naming --- roles/bootstrap/tasks/main.yml | 2 +- roles/create-user/tasks/main.yml | 2 +- roles/docker/tasks/main.yml | 8 ++++---- roles/install-packages/tasks/main.yml | 2 +- roles/update-packages/tasks/main.yml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/roles/bootstrap/tasks/main.yml b/roles/bootstrap/tasks/main.yml index dc2f61e..9840fd8 100644 --- a/roles/bootstrap/tasks/main.yml +++ b/roles/bootstrap/tasks/main.yml @@ -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: diff --git a/roles/create-user/tasks/main.yml b/roles/create-user/tasks/main.yml index 1a049f1..7ed70df 100644 --- a/roles/create-user/tasks/main.yml +++ b/roles/create-user/tasks/main.yml @@ -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 diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index aa1fac6..0e6da6b 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -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 diff --git a/roles/install-packages/tasks/main.yml b/roles/install-packages/tasks/main.yml index cc7e153..72c4982 100644 --- a/roles/install-packages/tasks/main.yml +++ b/roles/install-packages/tasks/main.yml @@ -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. diff --git a/roles/update-packages/tasks/main.yml b/roles/update-packages/tasks/main.yml index 4139778..67cb672 100644 --- a/roles/update-packages/tasks/main.yml +++ b/roles/update-packages/tasks/main.yml @@ -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