moved oracle_java_os_supported variable to be set on the defaults file instead of a fact.

Author: steenzout

README.md

@@ -53,6 +53,8 @@ DISCLAIMER: usage of any version of this role implies you have accepted the
 | oracle_java_version_update | 45 | the Oracle JDK version update. |
 | oracle_java_version_build | 14 | the Oracle JDK version update build number. |
 | oracle_java_version_string | 1.{{ oracle_java_version }}.0_u{{ oracle_java_version_update }} | the Java version string to verify installation against. |
+| oracle_java_os_supported variable | - | role internal variable to check if a OS family is supported or not. | 
+
 
 ### Debian-only
 

defaults/darwin.yml

@@ -0,0 +1,7 @@
+---
+# file: oracle-java/defaults/darwin.yml
+#
+# Default variables for Darwin-based distributions.
+#
+
+oracle_java_os_supported: no

defaults/debian.yml

@@ -7,6 +7,9 @@
 launchpad_ppa_webupd8_cache_valid_time: 3600
 
 oracle_java_cache_valid_time: "{{ launchpad_ppa_webupd8_cache_valid_time }}"
-oracle_java_state: latest
 
 oracle_java_home: "/usr/lib/jvm/java-{{ oracle_java_version }}-oracle"
+
+oracle_java_os_supported: yes
+
+oracle_java_state: latest

defaults/redhat.yml

@@ -6,5 +6,7 @@
 
 oracle_java_home: "/usr/java/jdk1.{{ oracle_java_version }}.0_{{ oracle_java_version_update }}"
 
+oracle_java_os_supported: yes
+
 oracle_java_rpm_filename: "jdk-{{ oracle_java_version }}u{{ oracle_java_version_update }}-linux-x64.rpm"
 oracle_java_rpm_url: "http://download.oracle.com/otn-pub/java/jdk/{{ oracle_java_version }}u{{ oracle_java_version_update }}-b{{ oracle_java_version_build }}/{{ oracle_java_rpm_filename }}"

tasks/debian/main.yml

@@ -4,13 +4,6 @@
 # Task file to install Oracle Java Development Kit in a system with a Debian based Linux distribution.
 #
 
-- name: debian is supported
-  set_fact:
-    oracle_java_os_supported: yes
-
-
-# installation
-
 - name: accept Oracle license
   shell: "echo oracle-java{{ oracle_java_version }}-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections"
   changed_when: no

tasks/debug.yml

@@ -24,6 +24,11 @@
     msg="oracle_java_home={{ oracle_java_home }}"
   when: oracle_java_home is defined
 
+- name: echo oracle_java_os_supported
+  debug:
+    msg="oracle_java_os_supported={{ oracle_java_os_supported }}"
+  when: oracle_java_os_supported is defined
+
 - name: echo oracle_java_rpm_url
   debug:
     msg="oracle_java_rpm_url={{ oracle_java_rpm_url }}"

tasks/main.yml

@@ -12,9 +12,9 @@
 - name: include OS family/distribution specific variables
   include_vars: "{{ item }}"
   with_first_found:
-    - "../defaults/{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml"
-    - "../defaults/{{ ansible_distribution }}.yml"
-    - "../defaults/{{ ansible_os_family }}.yml"
+    - "../defaults/{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml"
+    - "../defaults/{{ ansible_distribution | lower }}.yml"
+    - "../defaults/{{ ansible_os_family | lower }}.yml"
 
 - name: debug variables
   include: debug.yml
@@ -34,4 +34,4 @@
 - name: check if operating system is suported
   fail:
     msg: "The operating system ({{ ansible_os_family }}) of the target machine ({{ inventory_hostname }}) is not currently supported."
-  when: oracle_java_os_supported is not defined
+  when: oracle_java_os_supported is not defined or not oracle_java_os_supported

tasks/redhat/main.yml

@@ -4,13 +4,6 @@
 # Task file to install Oracle Java Development Kit in a system with a Redhat based Linux distribution.
 #
 
-- name: redhat is supported
-  set_fact:
-    oracle_java_os_supported: yes
-
-
-# installation
-
 - name: in case Java needs to be installed, determine if the RPM needs to be downloaded
   stat:
     path="{{ oracle_java_dir_source }}/{{ oracle_java_rpm_filename }}"