Rebase to 2.9.0

Author: arnaudfroidmont

playbooks/roles/autoscaling_mon/tasks/el7.yml renamed to playbooks/roles/autoscaling_mon/tasks/el.yml

@@ -1,5 +1,2 @@
-- include: ol7.yml
-  when: ansible_os_family == 'RedHat' and ansible_distribution == 'OracleLinux' and ansible_distribution_major_version == '7'
-
-- include: el7.yml
-  when: ansible_os_family == 'RedHat' and ansible_distribution == 'CentOS' and ansible_distribution_major_version == '7'
+- include: el.yml
+  when: ansible_os_family == 'RedHat'

playbooks/roles/autoscaling_mon/tasks/main.yml

@@ -230,7 +230,7 @@
       when: monitoring|default(false)|bool
     - include_role: 
         name: autoscaling_mon
-      when: autoscaling_monitoring|default(false)|bool and autoscaling|default(false)|bool
+      when: autoscaling_monitoring|default(false)|bool
     - include_role: 
         name: cron