Merge pull request #33 from ansiblebit/pr32

continuation of PR #32

Author: steenzout

.travis.yml

@@ -3,12 +3,12 @@ sudo: yes
 
 matrix:
   include:
+    - python: 2.7
+      env: TOXENV=py27-ansible22
     - python: 2.7
       env: TOXENV=py27-ansible21
     - python: 2.7
       env: TOXENV=py27-ansible20
-    - python: 2.7
-      env: TOXENV=py27-ansible19
 
 install:
   - pip install tox

README.md

@@ -31,7 +31,7 @@ DISCLAIMER: usage of any version of this role implies you have accepted the
 
 ## Requirements
 
-- ansible >= 1.9.x
+- ansible >= 2.x
 
 
 # Facts
@@ -46,11 +46,11 @@ DISCLAIMER: usage of any version of this role implies you have accepted the
 | variable | default | description |
 |--:|:-:|:--|
 | debug | undefined | flag to make role more verbose. |
-| oracle_java_set_as_default | no | make the newly installed Java the default runtime environment. |
+| oracle_java_set_as_default | yes | make the newly installed Java the default runtime environment. |
 | oracle_java_state   | latest | the package state (see Ansible apt module for more information). |
 | oracle_java_version | 8 | the Oracle JDK version to be installed. |
-| oracle_java_version_update | 74 | the Oracle JDK version update. |
-| oracle_java_version_build | 02 | the Oracle JDK version update build number. |
+| oracle_java_version_update | 121 | the Oracle JDK version update. |
+| oracle_java_version_build | 13 | 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 | - | role internal variable to check if a OS family is supported or not. | 
 
@@ -59,7 +59,6 @@ DISCLAIMER: usage of any version of this role implies you have accepted the
 
 | variable | default | description |
 |--:|:-:|:--|
-| launchpad_ppa_webupd8_cache_valid_time | 3600 | the amount of time in seconds the apt cache is valid. |
 | oracle_java_cache_valid_time | 3600 | the amount of time in seconds the apt cache is valid. |
 | oracle_java_state   | latest | the package state (see Ansible apt module for more information). |
 | oracle_java_home | /usr/lib/jvm/java-{{ oracle_java_version }}-oracle | the location of the Java home directory. |
@@ -75,18 +74,11 @@ DISCLAIMER: usage of any version of this role implies you have accepted the
 | 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 }} | the URL where the RPM can be downloaded from. |
 
 
-## Dependencies
-
-For Debian and Ubuntu this role depends on:
-
-- ansiblebit.launchpad-ppa-webupd8
-
-
 ## Playbooks
 
     - hosts: servers
       roles:
-         - { role: ansiblebit.oracle-java,
-             oracle_java_set_as_default: yes }
+         - role: ansiblebit.oracle-java,
+           oracle_java_set_as_default: yes
 
 Use `--skip-tags=debug` if you want to suppress debug information.

defaults/main.yml

@@ -6,9 +6,9 @@
 
 oracle_java_dir_source: '/usr/local/src'
 
-oracle_java_set_as_default: no
+oracle_java_set_as_default: yes
 
 oracle_java_version: 8
-oracle_java_version_update: 74
-oracle_java_version_build: '02'
+oracle_java_version_update: 121
+oracle_java_version_build: 13
 oracle_java_version_string: "1.{{ oracle_java_version }}.0_{{ oracle_java_version_update }}"

meta/main.yml

@@ -9,7 +9,7 @@ galaxy_info:
   description: Role to install Oracle Java.
   company: ansiblebit.org
   license: BSD
-  min_ansible_version: 1.9.4
+  min_ansible_version: 2.0
   platforms:
     - name: CentOS
       versions:
@@ -37,7 +37,3 @@ galaxy_info:
     - development
     - java
     - system
-
-dependencies:
-  - role: ansiblebit.launchpad-ppa-webupd8
-    when: ansible_distribution | lower == 'debian' or ansible_distribution | lower == 'ubuntu'

requirements.yml

@@ -1,2 +0,0 @@
-- src: ansiblebit.launchpad-ppa-webupd8
-  version: 4.14.0

tasks/check_environment.yml

@@ -9,27 +9,24 @@
 - name: determine if Java is already installed
   shell: which java
   register: oracle_java_task_installed
-  ignore_errors: yes
-  changed_when: False
+  changed_when: "{{ oracle_java_task_installed.rc != 0 }}"
+  failed_when: no
 # oracle_java_installed.rc == 0 : installed
 # oracle_java_installed.rc == 1 : not installed
 
-
 - name: set fact oracle_java_installed
   set_fact:
-    oracle_java_installed={{ oracle_java_task_installed.rc == 0 }}
-  when: oracle_java_task_installed is defined and oracle_java_task_installed.rc is defined
-  changed_when: False
+    oracle_java_installed={{ not oracle_java_task_installed.changed }}
 
 - name: determine which Java version is installed
-  shell: java -version 2>&1 | head -n 1 | awk '{ print $3 }' | awk -F '"' '{ print $2 }'
-  when: oracle_java_installed is defined
+  shell: java -version
+  when: oracle_java_installed
   register: oracle_java_task_version
   changed_when: False
 
 - name: set fact oracle_java_installed_version
   set_fact:
-    oracle_java_version_installed={{ oracle_java_task_version.stdout }}
+    oracle_java_version_installed="{{ oracle_java_task_version.stderr.split('\n')[0]|regex_replace('.*\"(.*)\"','\\1') }}"
   when: oracle_java_task_version is defined and oracle_java_task_version.stdout is defined
   changed_when: False
 

tasks/debian/main.yml

@@ -4,12 +4,48 @@
 # Task file to install Oracle Java Development Kit in a system with a Debian based Linux distribution.
 #
 
-- 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
+- block:
+  - name: debian | ubuntu | add java ppa repo
+    apt_repository:
+      repo=ppa:webupd8team/java
+      state=present
+    become: yes
+
+  - name: debian | ubuntu | check if oracle license is already accepted
+    shell: debconf-get-selections |grep "oracle-java{{ oracle_java_version }}-installer\sshared/accepted-oracle-license-v1-1\sboolean\strue"
+    register: licence_not_accepted
+    failed_when: false
+    changed_when: licence_not_accepted.rc != 0
+    become: yes
+
+  when: "{{ ansible_distribution == 'Ubuntu' }}"
+
+- block:
+  - name: debian | ensure the webupd8 launchpad apt repository key is present
+    apt_key:
+      id=0xC2518248EEA14886
+      keyserver=keyserver.ubuntu.com
+      state=present
+    become: yes
+
+  - name: debian | ensure the webupd8 launchpad apt repository is present
+    apt_repository:
+      repo="{{ item }} http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main"
+      update_cache=yes
+      state=present
+    with_items:
+      - deb
+      - deb-src
+    become: yes
+
+  when: "{{ ansible_distribution == 'Debian' }}"
+
+- name: debian | set license as accepted
+  debconf: name='oracle-java{{ oracle_java_version }}-installer' question='shared/accepted-oracle-license-v1-1' value='true' vtype='select'
+  when: "{{ licence_not_accepted|changed or licence_not_accepted|skipped }}"
   become: yes
 
-- name: ensure Java is installed
+- name: debian | ensure Java is installed
   apt:
     name="oracle-java{{ oracle_java_version }}-installer"
     state={{ oracle_java_state }}
@@ -18,14 +54,14 @@
   register: oracle_java_task_apt_install
   become: yes
 
-- name: set Java version as default
+- name: debian | set Java version as default
   apt:
     name="oracle-java{{ oracle_java_version }}-set-default"
     state=latest
   register: oracle_java_task_set_default
   when: oracle_java_set_as_default
   become: yes
 
-- name: in case there were changes, check host environment again
+- name: debian | in case there were changes, check host environment again
   include: ../check_environment.yml
   when: oracle_java_task_apt_install|changed or oracle_java_task_set_default|changed

tasks/main.yml

@@ -15,6 +15,7 @@
     - "../defaults/{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml"
     - "../defaults/{{ ansible_distribution | lower }}.yml"
     - "../defaults/{{ ansible_os_family | lower }}.yml"
+  tags: installation
 
 - include: debug.yml
   when: debug | default(false)

tasks/redhat/main.yml

@@ -5,10 +5,10 @@
 #
 
 - name: download Java RPM
-  shell:
-    "curl -L  -H 'Cookie:oraclelicense=accept-securebackup-cookie' -o {{ oracle_java_dir_source }}/{{ oracle_java_rpm_filename }} {{ oracle_java_rpm_url }}"
-  args:
-    creates: "{{ oracle_java_dir_source }}/{{ oracle_java_rpm_filename }}"
+  get_url:
+    headers: 'Cookie:oraclelicense=accept-securebackup-cookie'
+    dest: "{{ oracle_java_dir_source }}/{{ oracle_java_rpm_filename }}"
+    url: "{{ oracle_java_rpm_url }}"
   register: oracle_java_task_rpm_download
   become: yes
   tags:

tests/test.yml

@@ -18,8 +18,8 @@
   vars:
     debug: yes
     test_java_version: 8
-    test_java_version_update: 111
-    test_java_version_build: 14
+    test_java_version_update: 121
+    test_java_version_build: 13
 
   roles:
     - role: oracle-java