Fix virtualization condition

7 files changed, 18 insertions, 16 deletions

diff --git a/roles/common/tasks/aide.yml b/roles/common/tasks/aide.yml
index f14da74..bbaeff5 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 == "NA" or ansible_virtualization_role == "host"
+  when: ansible_virtualization_role is not defined or ansible_virtualization_role == "host"
   notify: initialize aide
diff --git a/roles/common/tasks/cron.yml b/roles/common/tasks/cron.yml
index a5d7f8e..823af2d 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 == "NA" or ansible_virtualization_role == "host"
+  when: ansible_virtualization_role is not defined 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 == "NA" or ansible_virtualization_role == "host"
+  when: ansible_virtualization_role is not defined 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 == "NA" or ansible_virtualization_role == "host"
+  when: ansible_virtualization_role is not defined 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 == "NA" or ansible_virtualization_role == "host"
+  when: ansible_virtualization_role is not defined or ansible_virtualization_role == "host"
diff --git a/roles/common/tasks/dnf.yml b/roles/common/tasks/dnf.yml
index e90722d..9afc425 100644
--- a/roles/common/tasks/dnf.yml
+++ b/roles/common/tasks/dnf.yml
@@ -19,18 +19,20 @@
             value=false
   when: ansible_distribution_version|int >= 22 and ansible_architecture == "x86_64"
         and ansible_distribution_release != "Rawhide"
-        or ansible_virtualization_role == "guest" and ansible_distribution_version|int >= 22
+        or ansible_virtualization_role is defined and ansible_virtualization_role == "guest"
 
 - name: Nombre mini de noyaux installés
   ini_file: dest=/etc/dnf/dnf.conf
             section=main
             option=installonly_limit
             value={{ minkernel }}
-  when: ansible_virtualization_role == "guest" and ansible_distribution_version|int >= 22
+  when: ansible_distribution == "Fedora" and ansible_distribution_version|int >= 22
+        and ansible_virtualization_role is defined and ansible_virtualization_role == "guest"
 
 - name: Nombre maxi de noyaux installés
   ini_file: dest=/etc/dnf/dnf.conf
             section=main
             option=installonly_limit
             value={{ maxkernel }}
-  when: ansible_virtualization_role != "guest" and ansible_distribution_version|int >= 22
+  when: ansible_distribution == "Fedora" and ansible_distribution_version|int >= 22
+        and ansible_virtualization_role is not defined or ansible_virtualization_role == "host"
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index c952bff..68b34f7 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -53,7 +53,7 @@
 
 - name: Installation de rkhunter
   include: rkhunter.yml
-  when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host"
+  when: ansible_virtualization_role is not defined or ansible_virtualization_role == "host"
 
 - name: Changement de shell pour root
   include: zsh.yml
diff --git a/roles/common/tasks/pkgs.yml b/roles/common/tasks/pkgs.yml
index 1268953..ae3a4df 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 == "NA" or ansible_virtualization_role == "host"
+  when: ansible_virtualization_role is not defined 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 a057b9d..5d15e04 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 == "NA" or ansible_virtualization_role == "host"
+  when: ansible_virtualization_role is not defined 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 == "NA" or ansible_virtualization_role == "host"
+  when: ansible_virtualization_role is not defined or ansible_virtualization_role == "host"
 
 - name: Activation et démarrage du service Smartd
   service: name=smartd state=started enabled=yes
-  when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host"
+  when: ansible_virtualization_role is not defined 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 390c567..eaf1634 100644
--- a/roles/common/tasks/yum.yml
+++ b/roles/common/tasks/yum.yml
@@ -17,18 +17,18 @@
             value=0
   when: ansible_distribution_version|int >= 20 and ansible_architecture == "x86_64"
         and ansible_distribution_release != "Rawhide"
-        or ansible_virtualization_role == "guest"
+        or ansible_virtualization_role is defined and ansible_virtualization_role == "guest"
 
 - name: Nombre mini de noyaux installés
   ini_file: dest=/etc/yum.conf
             section=main
             option=installonly_limit
             value={{ minkernel }}
-  when: ansible_virtualization_role == "guest"
+  when: ansible_virtualization_role is defined and ansible_virtualization_role == "guest"
 
 - name: Nombre maxi de noyaux installés
   ini_file: dest=/etc/yum.conf
             section=main
             option=installonly_limit
             value={{ maxkernel }}
-  when: ansible_virtualization_role != "guest"
+  when: ansible_virtualization_role is not defined or ansible_virtualization_role == "host"