From 0d4851a4ef7ded3db0d807643330092536dd1a3e Mon Sep 17 00:00:00 2001 From: Avesh Agarwal Date: Fri, 24 Jul 2015 18:29:55 -0400 Subject: [PATCH] Ansible updates for Atomic. --- contrib/ansible/roles/kubernetes/tasks/fedora.yml | 2 +- contrib/ansible/roles/kubernetes/tasks/gen_certs.yml | 1 + .../roles/master/tasks/packageManagerInstall.yml | 5 +++++ .../master/tasks/pkgMgrInstallers/centos-install.yml | 1 - .../master/tasks/pkgMgrInstallers/fedora-install.yml | 1 - .../master/tasks/pkgMgrInstallers/generic-install.yml | 1 - contrib/ansible/roles/node/tasks/main.yml | 10 ++-------- .../ansible/roles/node/tasks/packageManagerInstall.yml | 5 +++++ .../node/tasks/pkgMgrInstallers/centos-install.yml | 1 - .../node/tasks/pkgMgrInstallers/fedora-install.yml | 1 - .../node/tasks/pkgMgrInstallers/generic-install.yml | 1 - 11 files changed, 14 insertions(+), 15 deletions(-) diff --git a/contrib/ansible/roles/kubernetes/tasks/fedora.yml b/contrib/ansible/roles/kubernetes/tasks/fedora.yml index ad326e3c5c..21a5286836 100644 --- a/contrib/ansible/roles/kubernetes/tasks/fedora.yml +++ b/contrib/ansible/roles/kubernetes/tasks/fedora.yml @@ -1,4 +1,4 @@ --- - 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" diff --git a/contrib/ansible/roles/kubernetes/tasks/gen_certs.yml b/contrib/ansible/roles/kubernetes/tasks/gen_certs.yml index 3c94409ea2..2296a8400f 100644 --- a/contrib/ansible/roles/kubernetes/tasks/gen_certs.yml +++ b/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: diff --git a/contrib/ansible/roles/master/tasks/packageManagerInstall.yml b/contrib/ansible/roles/master/tasks/packageManagerInstall.yml index 2bc950a0c0..949c153cf4 100644 --- a/contrib/ansible/roles/master/tasks/packageManagerInstall.yml +++ b/contrib/ansible/roles/master/tasks/packageManagerInstall.yml @@ -1,4 +1,9 @@ --- +- 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" diff --git a/contrib/ansible/roles/master/tasks/pkgMgrInstallers/centos-install.yml b/contrib/ansible/roles/master/tasks/pkgMgrInstallers/centos-install.yml index 0d04c7c825..86ef8e2512 100644 --- a/contrib/ansible/roles/master/tasks/pkgMgrInstallers/centos-install.yml +++ b/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 diff --git a/contrib/ansible/roles/master/tasks/pkgMgrInstallers/fedora-install.yml b/contrib/ansible/roles/master/tasks/pkgMgrInstallers/fedora-install.yml index 865dad2d59..a4ca62bede 100644 --- a/contrib/ansible/roles/master/tasks/pkgMgrInstallers/fedora-install.yml +++ b/contrib/ansible/roles/master/tasks/pkgMgrInstallers/fedora-install.yml @@ -6,4 +6,3 @@ enablerepo: "updates-testing" notify: - restart daemons - when: not is_atomic diff --git a/contrib/ansible/roles/master/tasks/pkgMgrInstallers/generic-install.yml b/contrib/ansible/roles/master/tasks/pkgMgrInstallers/generic-install.yml index dbd6afe05e..dddf7170c3 100644 --- a/contrib/ansible/roles/master/tasks/pkgMgrInstallers/generic-install.yml +++ b/contrib/ansible/roles/master/tasks/pkgMgrInstallers/generic-install.yml @@ -5,4 +5,3 @@ state: latest notify: - restart daemons - when: not is_atomic diff --git a/contrib/ansible/roles/node/tasks/main.yml b/contrib/ansible/roles/node/tasks/main.yml index 7744d0dc34..ecc57bfc58 100644 --- a/contrib/ansible/roles/node/tasks/main.yml +++ b/contrib/ansible/roles/node/tasks/main.yml @@ -1,13 +1,7 @@ --- -- 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" diff --git a/contrib/ansible/roles/node/tasks/packageManagerInstall.yml b/contrib/ansible/roles/node/tasks/packageManagerInstall.yml index 2bc950a0c0..949c153cf4 100644 --- a/contrib/ansible/roles/node/tasks/packageManagerInstall.yml +++ b/contrib/ansible/roles/node/tasks/packageManagerInstall.yml @@ -1,4 +1,9 @@ --- +- 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" diff --git a/contrib/ansible/roles/node/tasks/pkgMgrInstallers/centos-install.yml b/contrib/ansible/roles/node/tasks/pkgMgrInstallers/centos-install.yml index 9f8a413f5a..577c6f84dd 100644 --- a/contrib/ansible/roles/node/tasks/pkgMgrInstallers/centos-install.yml +++ b/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 diff --git a/contrib/ansible/roles/node/tasks/pkgMgrInstallers/fedora-install.yml b/contrib/ansible/roles/node/tasks/pkgMgrInstallers/fedora-install.yml index 97ef31bbd8..c1cab53016 100644 --- a/contrib/ansible/roles/node/tasks/pkgMgrInstallers/fedora-install.yml +++ b/contrib/ansible/roles/node/tasks/pkgMgrInstallers/fedora-install.yml @@ -6,4 +6,3 @@ enablerepo: "updates-testing" notify: - restart daemons - when: not is_atomic diff --git a/contrib/ansible/roles/node/tasks/pkgMgrInstallers/generic-install.yml b/contrib/ansible/roles/node/tasks/pkgMgrInstallers/generic-install.yml index c4619116f7..404981b0fe 100644 --- a/contrib/ansible/roles/node/tasks/pkgMgrInstallers/generic-install.yml +++ b/contrib/ansible/roles/node/tasks/pkgMgrInstallers/generic-install.yml @@ -5,4 +5,3 @@ state: latest notify: - restart daemons - when: not is_atomic