diff options
| author | Matthieu Saulnier <fantom@fedoraproject.org> | 2014-07-05 15:25:42 +0200 |
|---|---|---|
| committer | Matthieu Saulnier <fantom@fedoraproject.org> | 2014-07-05 15:25:42 +0200 |
| commit | 4d195be335a3a3719381d35440674d0dc27aca1f (patch) | |
| tree | c6e147c88d0b7e2cb5ff9420e115273a3bedc9d4 /roles/common | |
| parent | 7e58edbcefb9a2709f63938ccae13bce6fd1393d (diff) | |
| download | playbooks-ansible-4d195be335a3a3719381d35440674d0dc27aca1f.tar.gz playbooks-ansible-4d195be335a3a3719381d35440674d0dc27aca1f.tar.xz playbooks-ansible-4d195be335a3a3719381d35440674d0dc27aca1f.zip | |
Fix virtualization condition for hosts that don't support it
Diffstat (limited to 'roles/common')
| -rw-r--r-- | roles/common/tasks/cron.yml | 8 | ||||
| -rw-r--r-- | roles/common/tasks/pkgs.yml | 2 | ||||
| -rw-r--r-- | roles/common/tasks/services.yml | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/roles/common/tasks/cron.yml b/roles/common/tasks/cron.yml index 6169b0c..9bf2800 100644 --- a/roles/common/tasks/cron.yml +++ b/roles/common/tasks/cron.yml @@ -1,6 +1,6 @@ - name: Rapport disques durs template: src=diskreport.sh.j2 dest=/etc/cron.daily/diskreport.sh mode=755 - when: ansible_virtualization_role is not defined or ansible_virtualization_role == "host" + when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host" - name: Rapport SELinux copy: src=eaureport.sh dest=/etc/cron.daily/eaureport.sh mode=755 @@ -8,7 +8,7 @@ - name: Rapport RPM Verify copy: src=rpmreport.sh dest=/etc/cron.daily/rpmreport.sh mode=755 - when: ansible_virtualization_role is not defined or ansible_virtualization_role == "host" + when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host" - name: Relabel système de fichier copy: src=selinuxresto.sh dest=/etc/cron.monthly/selinuxresto.sh mode=755 @@ -16,9 +16,9 @@ - name: Tests disques durs template: src=diskcheck.sh.j2 dest=/etc/cron.weekly/diskcheck.sh mode=755 - when: ansible_virtualization_role is not defined or ansible_virtualization_role == "host" + when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host" - name: Installation du HIDS AIDE copy: src=z-aidereport.sh dest=/etc/cron.daily/z-aidereport.sh mode=755 - when: ansible_virtualization_role is not defined or ansible_virtualization_role == "host" + when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host" notify: initialize aide diff --git a/roles/common/tasks/pkgs.yml b/roles/common/tasks/pkgs.yml index 64f24b1..5dfb03c 100644 --- a/roles/common/tasks/pkgs.yml +++ b/roles/common/tasks/pkgs.yml @@ -52,4 +52,4 @@ - memtest86+ - lm_sensors - smartmontools - when: ansible_virtualization_role is not defined or ansible_virtualization_role == "host" + when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host" diff --git a/roles/common/tasks/services.yml b/roles/common/tasks/services.yml index a497e89..393fab0 100644 --- a/roles/common/tasks/services.yml +++ b/roles/common/tasks/services.yml @@ -6,11 +6,11 @@ - name: Activation et démarrage du service lm_sensors service: name=lm_sensors state=started enabled=yes - when: ansible_virtualization_role is not defined or ansible_virtualization_role == "host" + when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host" - name: Activation et démarrage du service Smartd service: name=smartd state=started enabled=yes - when: ansible_virtualization_role is not defined or ansible_virtualization_role == "host" + when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host" - name: Activation et démarrage du service At service: name=atd state=started enabled=yes |