diff options
author | Matthieu Saulnier <fantom@fedoraproject.org> | 2018-08-26 13:02:16 +0200 |
---|---|---|
committer | Matthieu Saulnier <fantom@fedoraproject.org> | 2018-08-26 13:02:16 +0200 |
commit | 39c5f71be01a7bc52563852b1610bccfb9319bee (patch) | |
tree | 57736a9f505099d1247da1b7c71ad50a23955067 | |
parent | 19a23ab85485210301ecd4e9dfbca4363573a8db (diff) | |
download | playbooks-ansible-39c5f71be01a7bc52563852b1610bccfb9319bee.tar.gz playbooks-ansible-39c5f71be01a7bc52563852b1610bccfb9319bee.tar.xz playbooks-ansible-39c5f71be01a7bc52563852b1610bccfb9319bee.zip |
Fix ansible_virtualization_role condition
-rw-r--r-- | roles/common/tasks/aide.yml | 2 | ||||
-rw-r--r-- | roles/common/tasks/cron.yml | 8 | ||||
-rw-r--r-- | roles/common/tasks/dnf.yml | 2 | ||||
-rw-r--r-- | roles/common/tasks/main.yml | 2 | ||||
-rw-r--r-- | roles/common/tasks/pkgs.yml | 2 | ||||
-rw-r--r-- | roles/common/tasks/services.yml | 6 | ||||
-rw-r--r-- | roles/common/tasks/yum.yml | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/roles/common/tasks/aide.yml b/roles/common/tasks/aide.yml index bbaeff5..f14da74 100644 --- a/roles/common/tasks/aide.yml +++ b/roles/common/tasks/aide.yml @@ -8,5 +8,5 @@ - name: Activation Cron du HIDS AIDE copy: src=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/cron.yml b/roles/common/tasks/cron.yml index 823af2d..a5d7f8e 100644 --- a/roles/common/tasks/cron.yml +++ b/roles/common/tasks/cron.yml @@ -8,16 +8,16 @@ - 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 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: 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: Rapport d'uptime des machines physiques copy: src=uptimereport.sh dest=/etc/cron.weekly/a-uptimereport.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" diff --git a/roles/common/tasks/dnf.yml b/roles/common/tasks/dnf.yml index 9afc425..4f856ec 100644 --- a/roles/common/tasks/dnf.yml +++ b/roles/common/tasks/dnf.yml @@ -35,4 +35,4 @@ option=installonly_limit value={{ maxkernel }} when: ansible_distribution == "Fedora" and ansible_distribution_version|int >= 22 - and ansible_virtualization_role is not defined or ansible_virtualization_role == "host" + and ansible_virtualization_role == "NA" or ansible_virtualization_role == "host" diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 57f902b..f9e110d 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -53,7 +53,7 @@ - name: Installation de rkhunter import_tasks: rkhunter.yml - when: ansible_virtualization_role is not defined or ansible_virtualization_role == "host" + when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host" - name: Changement de shell pour root import_tasks: zsh.yml diff --git a/roles/common/tasks/pkgs.yml b/roles/common/tasks/pkgs.yml index ae3a4df..1268953 100644 --- a/roles/common/tasks/pkgs.yml +++ b/roles/common/tasks/pkgs.yml @@ -65,7 +65,7 @@ - lm_sensors - hddtemp - smartmontools - when: ansible_virtualization_role is not defined or ansible_virtualization_role == "host" + when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host" - name: Installation d'un programme de gravure dnf: name=wodim state=present diff --git a/roles/common/tasks/services.yml b/roles/common/tasks/services.yml index 5d15e04..a057b9d 100644 --- a/roles/common/tasks/services.yml +++ b/roles/common/tasks/services.yml @@ -1,14 +1,14 @@ - name: Activation et démarrage du service Console Mouse Manager service: name=gpm 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 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 diff --git a/roles/common/tasks/yum.yml b/roles/common/tasks/yum.yml index eaf1634..01bb575 100644 --- a/roles/common/tasks/yum.yml +++ b/roles/common/tasks/yum.yml @@ -31,4 +31,4 @@ section=main option=installonly_limit value={{ maxkernel }} - when: ansible_virtualization_role is not defined or ansible_virtualization_role == "host" + when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host" |