fixed problem when including variables overrides user defined parameters [closes #93].

steenzout · steenzout · commit 9ef18091b7db · 2018-08-20T00:24:33.000-06:00
diff --git a/README.md b/README.md
@@ -44,37 +44,37 @@ DISCLAIMER: usage of any version of this role implies you have accepted the
 ## Role Variables
 
 - **debug**: flag to make role more verbose.
-- **oracle_java_set_as_default**: make the newly installed Java the default runtime environment (default: `yes`).
 - **oracle_java_os_supported**: role internal variable to check if a OS family is supported or not.
 
 ### Debian
 
-- **oracle_java_apt_repository**: Personal Package Archive (PPA) from where to install Java (default: `deb http://ppa.launchpad.net/linuxuprising/java/ubuntu bionic main`).
-- **oracle_java_apt_repository_key**: PPA repository key (default: `EA8CACC073C3DB2A`.
-- **oracle_java_cache_valid_time**: the amount of time in seconds the apt cache is valid (default: `3600`).
-- **oracle_java_deb_package**: name of debian package (default: `oracle-java10-installer`).
-- **oracle_java_debconf_package_default**: (default: `oracle-java10-set-default`).
-- **oracle_java_home**: the location of the Java home directory (default: `/usr/lib/jvm/java-10-oracle`).
-- **oracle_java_state**:** the package state (see Ansible apt module for more information) (default: `latest`).
+- **oracle_java_apt_repository**: Personal Package Archive (PPA) from where to install Java.
+- **oracle_java_apt_repository_key**: PPA repository key.
+- **oracle_java_cache_valid_time**: the amount of time in seconds the apt cache is valid.
+- **oracle_java_deb_package**: name of debian package.
+- **oracle_java_debconf_package_default**: name of debconf package to set default.
+- **oracle_java_home**: the location of the Java home directory.
+- **oracle_java_state**:** the package state (see Ansible apt module for more information).
 
 ### Debian/Ubuntu
 
-- **oracle_java_apt_repository**: Personal Package Archive (PPA) from where to install Java (default: `ppa:linuxuprising/java`).
-- **oracle_java_cache_valid_time**: the amount of time in seconds the apt cache is valid (default: `3600`).
-- **oracle_java_deb_package**: name of debian package (default: `oracle-java10-installer`).
-- **oracle_java_debconf_package_default**: (default: `oracle-java10-set-default`).
-- **oracle_java_home**: the location of the Java home directory (default: `/usr/lib/jvm/java-10-oracle`).
-- **oracle_java_state**:** the package state (see Ansible apt module for more information) (default: `latest`).
+- **oracle_java_apt_repository**: Personal Package Archive (PPA) from where to install Java.
+- **oracle_java_cache_valid_time**: the amount of time in seconds the apt cache is valid.
+- **oracle_java_deb_package**: name of debian package.
+- **oracle_java_debconf_package_default**: name of debconf package to set default.
+- **oracle_java_home**: the location of the Java home directory.
+- **oracle_java_state**:** the package state (see Ansible apt module for more information).
 
 ### Redhat-only
 
-- **oracle_java_dir_source**: directory where to store the RPM files (default: `/usr/local/src`).
-- **oracle_java_download_timeout**: download timeout, in seconds (default: `60`).
-- **oracle_java_download_url**: where to download the rpm from (default: `http://download.oracle.com/otn-pub/java/jdk/10.0.2+13/19aef61b38124481863b1413dce1855f/jdk-10.0.2_linux-x64_bin.rpm`).
-- **oracle_java_home**: the location of the Java home directory (default: `/usr/java/default`).
-- **oracle_java_rpm_filename**: file name used for the download destination (default: `jdk-10.0.2_linux-x64_bin.rpm`).
-- **oracle_java_rpm_validate_certs**: flag to indicate if you want SSL certificate validation (default: `yes`).
-- **oracle_java_version_string**: the Java version string to verify installation against (default: `1.10.2`).
+- **oracle_java_dir_source**: directory where to store the RPM files.
+- **oracle_java_download_timeout**: download timeout, in seconds.
+- **oracle_java_home**: the location of the Java home directory.
+- **oracle_java_rpm_filename**: file name used for the download destination.
+- **oracle_java_rpm_url**: where to download the rpm from.
+- **oracle_java_rpm_validate_certs**: flag to indicate if you want SSL certificate validation.
+- **oracle_java_set_as_default**: flag to indicate if this should be set as the default version.
+- **oracle_java_version_string**: the Java version string to verify installation against.
 
 ## Playbooks
 
@@ -84,32 +84,74 @@ DISCLAIMER: usage of any version of this role implies you have accepted the
   roles:
       - role: ansiblebit.oracle-java
 
-# debian + debian/ubuntu | Java 10
+# debian | Java 10
 - hosts: servers
   roles:
       - role: ansiblebit.oracle-java
-
-# debian + debian/ubuntu | Java 8
+        oracle_java_apt_repository: 'deb http://ppa.launchpad.net/linuxuprising/java/ubuntu bionic main'
+        oracle_java_apt_repository_key: 'EA8CACC073C3DB2A'
+        oracle_java_cache_valid_time: 3600
+        oracle_java_deb_package: 'oracle-java10-installer'
+        oracle_java_debconf_package_default: 'oracle-java10-set-default'
+        oracle_java_home: "/usr/lib/jvm/java-10-oracle"
+        oracle_java_state: latest
+
+# debian | Java 8
 - hosts: servers
   roles:
       - role: ansiblebit.oracle-java
-        oracle_java_apt_repository: "ppa:webupd8team/java"
-
-# debian | custom | Java 10
+        oracle_java_apt_repository: 'deb http://ppa.launchpad.net/webupd8team/java/ubuntu bionic main'
+        oracle_java_apt_repository_key: 'EA8CACC073C3DB2A'
+        oracle_java_cache_valid_time: 3600
+        oracle_java_deb_package: 'oracle-java8-installer'
+        oracle_java_debconf_package_default: 'oracle-java8-set-default'
+        oracle_java_home: "/usr/lib/jvm/java-8-oracle"
+        oracle_java_state: latest
+
+# debian | ubuntu | Java 10
 - hosts: servers
   roles:
       - role: ansiblebit.oracle-java
-        oracle_java_apt_repository: 'deb http://ppa.launchpad.net/linuxuprising/java/ubuntu bionic main'
+        oracle_java_apt_repository: "ppa:linuxuprising/java"
+        oracle_java_cache_valid_time: 3600
+        oracle_java_deb_package: 'oracle-java10-installer'
+        oracle_java_debconf_package_default: 'oracle-java10-set-default'
+        oracle_java_home: "/usr/lib/jvm/java-10-oracle"
+        oracle_java_state: latest
+
+# debian | ubuntu | Java 8
+- hosts: servers
+  roles:
+      - role: ansiblebit.oracle-java
+        oracle_java_apt_repository: "ppa:webupd8team/java"
+        oracle_java_cache_valid_time: 3600
+        oracle_java_deb_package: 'oracle-java10-installer'
+        oracle_java_debconf_package_default: 'oracle-java10-set-default'
+        oracle_java_home: "/usr/lib/jvm/java-10-oracle"
+        oracle_java_state: latest
 
-# debian | custom | Java 8
+# redhat | centos 7 | Java 10
 - hosts: servers
   roles:
       - role: ansiblebit.oracle-java
-        oracle_java_apt_repository: 'deb http://ppa.launchpad.net/webupd8team/java/ubuntu bionic main'
+        oracle_java_dir_source: '/usr/local/src'
+        oracle_java_download_timeout: 60
+        oracle_java_home: '/usr/java/default'
+        oracle_java_rpm_filename: 'jdk-10.0.2_linux-x64_bin.rpm'
+        oracle_java_rpm_url: 'http://download.oracle.com/otn-pub/java/jdk/10.0.2+13/19aef61b38124481863b1413dce1855f/jdk-10.0.2_linux-x64_bin.rpm'
+        oracle_java_rpm_validate_certs: yes
+        oracle_java_set_as_default: yes
+        oracle_java_version_string: 10.0.2
 ```
 
 Use `--skip-tags=debug` if you want to suppress debug information.
 
+```yaml
+# URLs from where you can download the RPM
+  redhat:
+    10.0.2: http://download.oracle.com/otn-pub/java/jdk/10.0.2+13/19aef61b38124481863b1413dce1855f/jdk-10.0.2_linux-x64_bin.rpm
+```
+
 ## Test
 
 ```bash
diff --git a/defaults/debian-ubuntu.yml b/defaults/debian-ubuntu.yml
@@ -4,10 +4,4 @@
 # Default variables for Ubuntu Linux distributions.
 #
 
-oracle_java_apt_repository: "ppa:linuxuprising/java"
-oracle_java_cache_valid_time: 3600
-oracle_java_deb_package: 'oracle-java10-installer'
-oracle_java_debconf_package_default: 'oracle-java10-set-default'
-oracle_java_home: "/usr/lib/jvm/java-10-oracle"
 oracle_java_os_supported: yes
-oracle_java_state: latest
diff --git a/defaults/debian.yml b/defaults/debian.yml
@@ -4,11 +4,4 @@
 # Default variables for Debian-based Linux distributions.
 #
 
-oracle_java_apt_repository: 'deb http://ppa.launchpad.net/linuxuprising/java/ubuntu bionic main'
-oracle_java_apt_repository_key: 'EA8CACC073C3DB2A'
-oracle_java_cache_valid_time: 3600
-oracle_java_deb_package: 'oracle-java10-installer'
-oracle_java_debconf_package_default: 'oracle-java10-set-default'
-oracle_java_home: "/usr/lib/jvm/java-10-oracle"
 oracle_java_os_supported: yes
-oracle_java_state: latest
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -3,9 +3,3 @@
 #
 # defaults file
 #
-
-oracle_java_downloads:
-  10.0.2:
-    redhat: http://download.oracle.com/otn-pub/java/jdk/10.0.2+13/19aef61b38124481863b1413dce1855f/jdk-10.0.2_linux-x64_bin.rpm
-
-oracle_java_set_as_default: yes
diff --git a/defaults/redhat.yml b/defaults/redhat.yml
@@ -4,11 +4,4 @@
 # Default variables for Redhat-based Linux distributions.
 #
 
-oracle_java_dir_source: '/usr/local/src'
-oracle_java_download_timeout: 60
-oracle_java_rpm_filename: 'jdk-10.0.2_linux-x64_bin.rpm'
-oracle_java_home: '/usr/java/default'
 oracle_java_os_supported: yes
-oracle_java_rpm_url: 'http://download.oracle.com/otn-pub/java/jdk/10.0.2+13/19aef61b38124481863b1413dce1855f/jdk-10.0.2_linux-x64_bin.rpm'
-oracle_java_rpm_validate_certs: yes
-oracle_java_version_string: 10.0.2
diff --git a/tests/test.yml b/tests/test.yml
@@ -30,8 +30,15 @@
 
   roles:
     - role: oracle-java
+      oracle_java_dir_source: '/usr/local/src'
+      oracle_java_download_timeout: 60
+      oracle_java_rpm_filename: 'jdk-10.0.2_linux-x64_bin.rpm'
+      oracle_java_home: '/usr/java/default'
+      oracle_java_os_supported: yes
+      oracle_java_rpm_url: 'http://download.oracle.com/otn-pub/java/jdk/10.0.2+13/19aef61b38124481863b1413dce1855f/jdk-10.0.2_linux-x64_bin.rpm'
+      oracle_java_rpm_validate_certs: yes
       oracle_java_set_as_default: yes
-      oracle_java_rpm_validate_certs: no
+      oracle_java_version_string: 10.0.2
       when: ansible_os_family | lower == 'redhat'
 
     - role: tests
@@ -40,10 +47,12 @@
       when: ansible_os_family | lower == 'redhat'
 
     - role: oracle-java
-      oracle_java_set_as_default: yes
-      oracle_java_rpm_validate_certs: no
-      oracle_java_apt_repository: 'deb http://ppa.launchpad.net/webupd8team/java/ubuntu bionic main'
-      oracle_java_apt_repository_key: 'C2518248EEA14886'
+      oracle_java_apt_repository: "ppa:linuxuprising/java"
+      oracle_java_cache_valid_time: 3600
+      oracle_java_deb_package: 'oracle-java10-installer'
+      oracle_java_debconf_package_default: 'oracle-java10-set-default'
+      oracle_java_home: "/usr/lib/jvm/java-10-oracle"
+      oracle_java_state: latest
       when: ansible_os_family | lower == 'debian'
 
     - role: tests

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,3 @@`
`3`	`3`	`#`
`4`	`4`	`# defaults file`
`5`	`5`	`#`
`6`		`-`
`7`		`-oracle_java_downloads:`
`8`		`- 10.0.2:`
`9`		`- redhat: http://download.oracle.com/otn-pub/java/jdk/10.0.2+13/19aef61b38124481863b1413dce1855f/jdk-10.0.2_linux-x64_bin.rpm`
`10`		`-`
`11`		`-oracle_java_set_as_default: yes`