diff options
| author | Matthieu Saulnier <fantom@fedoraproject.org> | 2014-05-20 03:23:38 +0200 |
|---|---|---|
| committer | Matthieu Saulnier <fantom@fedoraproject.org> | 2014-05-20 03:23:38 +0200 |
| commit | c10d59d40cb89021567846e40d716a0e9552838b (patch) | |
| tree | 3189a63b986d4a59b0df04af61cd4b49a471b3d0 | |
| parent | 663623a5b62f82cc870cd41afe6e6c52a579c4e4 (diff) | |
| download | playbooks-ansible-c10d59d40cb89021567846e40d716a0e9552838b.tar.gz playbooks-ansible-c10d59d40cb89021567846e40d716a0e9552838b.tar.xz playbooks-ansible-c10d59d40cb89021567846e40d716a0e9552838b.zip | |
Fix some conditional statements in Common role
| -rw-r--r-- | roles/common/tasks/cron.yml | 4 | ||||
| -rw-r--r-- | roles/common/tasks/logo.yml | 1 | ||||
| -rw-r--r-- | roles/common/tasks/main.yml | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/roles/common/tasks/cron.yml b/roles/common/tasks/cron.yml index 3434c75..6169b0c 100644 --- a/roles/common/tasks/cron.yml +++ b/roles/common/tasks/cron.yml @@ -4,7 +4,7 @@ - name: Rapport SELinux copy: src=eaureport.sh dest=/etc/cron.daily/eaureport.sh mode=755 - when: ansible_virtualization_role is not defined or ansible_virtualization_role == "host" + when: ansible_selinux != false - name: Rapport RPM Verify copy: src=rpmreport.sh dest=/etc/cron.daily/rpmreport.sh mode=755 @@ -12,7 +12,7 @@ - name: Relabel système de fichier copy: src=selinuxresto.sh dest=/etc/cron.monthly/selinuxresto.sh mode=755 - when: ansible_virtualization_role is not defined or ansible_virtualization_role == "host" + when: ansible_selinux != false - name: Tests disques durs template: src=diskcheck.sh.j2 dest=/etc/cron.weekly/diskcheck.sh mode=755 diff --git a/roles/common/tasks/logo.yml b/roles/common/tasks/logo.yml index 8b3647e..dfdfa46 100644 --- a/roles/common/tasks/logo.yml +++ b/roles/common/tasks/logo.yml @@ -1,6 +1,5 @@ - name: Installation linux_logo Fedora yum: name=http://fantom.fedorapeople.org/linux_logo-5.11-6.fc20.x86_64.rpm state=present - when: ansible_distribution_version|int == 20 and ansible_architecture == "x86_64" - name: Ajout linux_logo en Exclude (yum) ini_file: dest=/etc/yum.conf diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 13f2e12..8ceaf5a 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -21,7 +21,7 @@ - name: Installation linux_logo Fedora include: logo.yml - when: ansible_distribution == "Fedora" + when: ansible_distribution_version|int == 20 and ansible_architecture == "x86_64" - name: Mise à jour et dépôt de mise à jour include: update.yml |