Merge pull request #11825 from aveshagarwal/ansible-fixes

contrib/ansible/roles/kubernetes/tasks/fedora.yml

 ---
 - name: Fedora | Remove docker window manager on F20
   yum: pkg=docker state=absent
-  when: not is_atomic and ansible_distribution_major_version == "20"
+  when: ansible_distribution_major_version == "20"

contrib/ansible/roles/kubernetes/tasks/gen_certs.yml

@@ -7,6 +7,7 @@
   with_items:
     - openssl
     - curl
+  when: not is_atomic
 
 #- name: Get create ca cert script from Kubernetes
 #  get_url:

contrib/ansible/roles/master/tasks/packageManagerInstall.yml

 ---
+- name: Set fact for Atomic Host package install
+  set_fact:
+    did_install: true
+  when: is_atomic
+
 - include: pkgMgrInstallers/centos-install.yml
   when: ansible_distribution == "CentOS"
 

contrib/ansible/roles/master/tasks/pkgMgrInstallers/centos-install.yml

@@ -6,4 +6,3 @@
     enablerepo=virt7-docker-common-candidate
   notify:
     - restart daemons
-  when: not is_atomic

contrib/ansible/roles/master/tasks/pkgMgrInstallers/fedora-install.yml

@@ -6,4 +6,3 @@
     enablerepo: "updates-testing"
   notify:
     - restart daemons
-  when: not is_atomic

contrib/ansible/roles/master/tasks/pkgMgrInstallers/generic-install.yml

@@ -5,4 +5,3 @@
     state: latest
   notify:
     - restart daemons
-  when: not is_atomic

contrib/ansible/roles/node/tasks/main.yml

 ---
-- name: Check if selinux enforcing
-  command: getenforce
-  register: selinux
-  changed_when: false
-  when: ansible_selinux
-
 - name: Set selinux permissive because tokens and selinux don't work together
-  selinux: state=permissive policy=targeted
-  when: ansible_selinux and 'Enforcing' in selinux.stdout
+  selinux: state=permissive policy={{ ansible_selinux.type }}
+  when: ansible_selinux is defined and ansible_selinux.status == "enabled"
 
 - include: packageManagerInstall.yml
   when: source_type == "packageManager"

contrib/ansible/roles/node/tasks/packageManagerInstall.yml

 ---
+- name: Set fact for Atomic Host package install
+  set_fact:
+    did_install: true
+  when: is_atomic
+
 - include: pkgMgrInstallers/centos-install.yml
   when: ansible_distribution == "CentOS"
 

contrib/ansible/roles/node/tasks/pkgMgrInstallers/centos-install.yml

@@ -6,4 +6,3 @@
     enablerepo=virt7-docker-common-candidate
   notify:
     - restart daemons
-  when: not is_atomic

contrib/ansible/roles/node/tasks/pkgMgrInstallers/fedora-install.yml

@@ -6,4 +6,3 @@
     enablerepo: "updates-testing"
   notify:
     - restart daemons
-  when: not is_atomic

contrib/ansible/roles/node/tasks/pkgMgrInstallers/generic-install.yml

@@ -5,4 +5,3 @@
     state: latest
   notify:
     - restart daemons
-  when: not is_atomic