Merge pull request #9 from frieder/issue-7

frieder · web-flow · commit d7d34d34911a · 2017-10-31T01:21:25.000+01:00
Updated unarchive task, removed force install option, updated readme
diff --git a/README.md b/README.md
@@ -59,7 +59,6 @@ All role variables are defined in `defaults/main.yml`. One can overwrite these v
 | oraclejdk_license_accept | false | When installing a JDK this must be set to true otherwise the play will fail. Not required when removing a JDK. |
 | oraclejdk_state | present | Defines whether to add or remove a JDK from the target host. Possible values are `[present,absent]`. |
 | oraclejdk_cleanup | true | Remove all temp files/folders (both local and remote) after installation. When set to true this will result in "changed" plays. |
-| oraclejdk_force_install | false | By default the role will check if the JDK installation folder already exists and skips the extraction of the archive if it does exist. Setting this value to true will force the role to extract the archive even when the folder already exists. Please be aware that this may overwrite any previously made changes (e. g. JCE policy files). |
 | oraclejdk_dl_dir | /tmp/oraclejdk | The folder (both local and remote) to which the archives get downloaded/copied/extracted. |
 | oraclejdk_home | | The Java home directory to which the JDK should get extracted to and to which JAVA_HOME will point to if set. |
 | oraclejdk_profile_file | /etc/profile.d/java.sh | The file in which the role will set the JAVA_HOME and PATH export. |
@@ -79,6 +78,37 @@ All role variables are defined in `defaults/main.yml`. One can overwrite these v
 
 Following are some examples how to use this role in an Ansible playbook.
 
+**JDK8 & JDK9 together, set home for JDK8, update alternatives for both JDKs with different priorities**
+```yaml
+- hosts: jdk
+  pre_tasks:
+  - name: Install required packages (127.0.0.1)
+    delegate_to: 127.0.0.1
+    package:
+      name: '{{ item }}'
+      state: present
+    with_items:
+    - tar
+    - unzip
+  roles:
+  - role: frieder.oraclejdk
+    oraclejdk_license_accept: true
+    oraclejdk_home: /opt/java/jdk9.0.1
+    oraclejdk_sethome: false
+    oraclejdk_alternative_prio: 100
+    oraclejdk_url: 'http://download.oracle.com/otn-pub/java/jdk/9.0.1+11/jdk-9.0.1_linux-x64_bin.tar.gz'
+    oraclejdk_checksum: 'sha256:2cdaf0ff92d0829b510edd883a4ac8322c02f2fc1beae95d048b6716076bc014'
+  - role: frieder.oraclejdk
+    oraclejdk_license_accept: true
+    oraclejdk_home: /opt/java/jdk8u151
+    oraclejdk_alternative_prio: 200
+    oraclejdk_url: 'http://download.oracle.com/otn-pub/java/jdk/8u151-b12/e758a0de34e24606bca991d704f6dcbf/jdk-8u151-linux-x64.tar.gz'
+    oraclejdk_checksum: 'sha256:c78200ce409367b296ec39be4427f020e2c585470c4eed01021feada576f027f'
+    oraclejdk_jce_install: true
+    oraclejdk_jce_url: 'http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip'
+    oraclejdk_jce_checksum: 'sha256:f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59'
+```
+
 **JDK8 w/ minimal configuration**
 ```yaml
 - hosts: jdk8
@@ -93,14 +123,6 @@ Following are some examples how to use this role in an Ansible playbook.
 **JDK8 w/ JCE**
 ```yaml
 - hosts: jdk8
-  pre_tasks:
-  - name: install required packages
-    package:
-      name: '{{ item }}'
-      state: present
-    with_items:
-    - tar
-    - unzip
   roles:
   - role: frieder.oraclejdk
     oraclejdk_license_accept: true
@@ -115,19 +137,10 @@ Following are some examples how to use this role in an Ansible playbook.
 **JDK8 full config**
 ```yaml
 - hosts: jdk8
-  pre_tasks:
-  - name: install required packages
-    package:
-      name: '{{ item }}'
-      state: present
-    with_items:
-    - tar
-    - unzip
   roles:
   - role: frieder.oraclejdk
     oraclejdk_license_accept: true
     oraclejdk_cleanup: true
-    oraclejdk_force_install: true
     oraclejdk_dl_dir: /tmp/java_download
     oraclejdk_home: /opt/java/java-8-151
     oraclejdk_sethome: true
@@ -183,10 +196,9 @@ Following are some examples how to use this role in an Ansible playbook.
     oraclejdk_home: /opt/java/jdk9.0.1
     oraclejdk_url: 'http://download.oracle.com/otn-pub/java/jdk/9.0.1+11/jdk-9.0.1_linux-x64_bin.tar.gz'
     oraclejdk_checksum: ''
-
-- hosts: jdk9
-  roles:
   - role: frieder.oraclejdk
     oraclejdk_state: absent
     oraclejdk_home: /opt/java/jdk9.0.1
 ```
+
+
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -4,7 +4,6 @@
 #
 oraclejdk_license_accept:   false   # must be set to true otherwise the play will fail
 oraclejdk_cleanup:          true    # will remove temp files <--> plabooks will return changed = true if true
-oraclejdk_force_install:    false   # will install the JDK even when its already installed (dir exist check)
 oraclejdk_state:            present
 
 oraclejdk_dl_dir:           /tmp/oraclejdk            # temp directory in which the archives are stored
diff --git a/tasks/02_fetchjdk.yml b/tasks/02_fetchjdk.yml
@@ -22,17 +22,6 @@
       set_fact:
         oraclejdk_dl_artefact_path: '{{ dl_result.dest }}'
 
-    - name: Get name of folder within JDK tar archive
-      shell: "tar tf {{ oraclejdk_dl_artefact_path }} | awk -F/ '{print $1}' | uniq"
-      args:
-        warn: false
-      register: dl_inspect
-      changed_when: false
-
-    - name: Set fact 'oraclejdk_dl_artefact_name' to name of folder in JDK archive
-      set_fact:
-        oraclejdk_dl_artefact_name: '{{ dl_inspect.stdout }}'
-
   tags:
     - oraclejdk
     - oraclejdk_download
diff --git a/tasks/04_installjdk.yml b/tasks/04_installjdk.yml
@@ -13,32 +13,20 @@
   block:
 
     - name: Copy and extract JDK archive
-      when: java_home_check.stat.exists == false or oraclejdk_force_install
+      when: java_home_check.stat.exists == false
       block:
 
-        - name: 'Create temp directory at {{ oraclejdk_dl_dir }}'
-          file:
-            path:   '{{ oraclejdk_dl_dir }}'
-            state:  directory
-
-        - name: 'Copy {{ oraclejdk_dl_artefact_path }} from source to target host'
-          copy:
-            src:    '{{ oraclejdk_dl_artefact_path }}'
-            dest:   '{{ oraclejdk_dl_artefact_path }}'
-
         - name: 'Create JDK base root directory at {{ oraclejdk_home }}'
           file:
             path:   '{{ oraclejdk_home }}'
             state:  directory
 
-        - name: 'Extract JDK archive to {{ oraclejdk_home }}/{{ oraclejdk_dl_artefact_name }}'
+        - name: 'Extract JDK archive to {{ oraclejdk_home }}'
           unarchive:
             src:        '{{ oraclejdk_dl_artefact_path }}'
             dest:       '{{ oraclejdk_home }}'
-            remote_src: true
+            extra_opts: ['--strip-components=1']
 
-        - name: Move JDK content & cleanup of obsolete folder
-          shell:  'mv {{ oraclejdk_home }}/{{ oraclejdk_dl_artefact_name }}/* {{ oraclejdk_home }} && rmdir {{ oraclejdk_home }}/{{ oraclejdk_dl_artefact_name }}'
 
     - name: Set JAVA_HOME
       when: oraclejdk_sethome
diff --git a/tasks/06_fetchjce.yml b/tasks/06_fetchjce.yml
@@ -5,9 +5,15 @@
     path:   '{{ oraclejdk_home }}/conf/security/java.security'
   register: jdk9_check
 
+- name: Check if JCE is already installed
+  when: oraclejdk_jce_install
+  shell: '{{ oraclejdk_home }}/bin/jrunscript -e "print (javax.crypto.Cipher.getMaxAllowedKeyLength(\"SHA256\") > 128);"'
+  changed_when: false
+  ignore_errors: true
+  register: jce_installed
 
 - name: Fetch Oracle Java Cryptography Extension (JCE) artefacts (JDK8 only)
-  when: oraclejdk_jce_install and jdk9_check.stat.exists == false
+  when: oraclejdk_jce_install and jce_installed.stdout == 'false' and jdk9_check.stat.exists == false
   delegate_to: 127.0.0.1
   run_once: true
   block:
@@ -24,6 +30,12 @@
         checksum: '{{ oraclejdk_jce_checksum }}'
         dest:     '{{ oraclejdk_dl_dir }}/{{ oraclejdk_jce_name }}.zip'
 
+    - name: Unzip Oracle JCE archive (JDK8 only)
+      unarchive:
+        src:      '{{ oraclejdk_dl_dir }}/{{ oraclejdk_jce_name }}.zip'
+        dest:     '{{ oraclejdk_dl_dir }}/'
+        remote_src: true
+
   tags:
     - oraclejdk
     - oraclejdk_jce
diff --git a/tasks/08_installjce.yml b/tasks/08_installjce.yml
@@ -3,56 +3,17 @@
 - name: JCE block
   block:
 
-  - name: Check if JCE is already installed
-    when: oraclejdk_jce_install
-    shell: '{{ oraclejdk_home }}/bin/jrunscript -e "print (javax.crypto.Cipher.getMaxAllowedKeyLength(\"SHA256\") > 128);"'
-    changed_when: false
-    ignore_errors: true
-    register: jce_installed
-
   # JDK8
   - name: Install Oracle Java Cryptography Extension (JDK8 only)
     when: oraclejdk_jce_install and jce_installed.stdout == 'false' and jdk9_check.stat.exists == false
-    block:
-
-      - name: 'Create temp directory at {{ oraclejdk_dl_dir }} (JDK8 only)'
-        file:
-          path:   '{{ oraclejdk_dl_dir }}'
-          state:  directory
-
-      - name: 'Copy Oracle JCE archive to temp directory at {{ oraclejdk_dl_dir }} (JDK8 only)'
-        copy:
-          src:    '{{ oraclejdk_dl_dir }}/{{ oraclejdk_jce_name }}.zip'
-          dest:   '{{ oraclejdk_dl_dir }}/{{ oraclejdk_jce_name }}.zip'
-
-      - name: Unzip Oracle JCE archive (JDK8 only)
-        unarchive:
-          src:        '{{ oraclejdk_dl_dir }}/{{ oraclejdk_jce_name }}.zip'
-          dest:       '{{ oraclejdk_dl_dir }}/'
-          remote_src: true
-
-      - name: Copy JCE policy files to JDK (JDK8 only)
-        copy:
-          src:        '{{ oraclejdk_dl_dir }}/{{ oraclejdk_jce_name }}/{{ item }}'
-          dest:       '{{ oraclejdk_home }}/jre/lib/security/{{ item }}'
-          remote_src: true
-        with_items:
-          - US_export_policy.jar
-          - local_policy.jar
-
-      - name: Check if JCE has successfully been installed (JDK8 only)
-        shell: '{{ oraclejdk_home }}/bin/jrunscript -e "print (javax.crypto.Cipher.getMaxAllowedKeyLength(\"SHA256\") > 128);"'
-        changed_when: false
-        ignore_errors: true
-        register: jce_check
-
-      - name: Fail if JCE installation was not successful
-        when: jce_check.stdout == 'false'
-        fail:
-          msg:  JCE has not successfully been installed.
-
-
-  # JDK9 (already enabled by default, only required to re-enable it)
+    copy:
+      src:    '{{ oraclejdk_dl_dir }}/{{ oraclejdk_jce_name }}/{{ item }}'
+      dest:   '{{ oraclejdk_home }}/jre/lib/security/{{ item }}'
+    with_items:
+      - US_export_policy.jar
+      - local_policy.jar
+
+  # JDK9
   - name: Enable unlimited Java Cryptography Extension key strength (JDK9 only)
     when: oraclejdk_jce_install and jce_installed.stdout == 'false' and jdk9_check.stat.exists == true
     lineinfile:
@@ -73,7 +34,6 @@
     fail:
       msg:  JCE has not successfully been installed.
 
-
   tags:
     - oraclejdk
     - oraclejdk_jce
diff --git a/tasks/10_cleanup.yml b/tasks/10_cleanup.yml
@@ -11,11 +11,6 @@
         path:   '{{ oraclejdk_dl_dir }}'
         state:  absent
 
-    - name: 'Remove temp folder at {{ oraclejdk_dl_dir }}'
-      file:
-        path:   '{{ oraclejdk_dl_dir }}'
-        state:  absent
-
   tags:
     - oraclejdk
     - oraclejdk_cleanup

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`#`
`5`	`5`	`oraclejdk_license_accept: false # must be set to true otherwise the play will fail`
`6`	`6`	`oraclejdk_cleanup: true # will remove temp files <--> plabooks will return changed = true if true`
`7`		`-oraclejdk_force_install: false # will install the JDK even when its already installed (dir exist check)`
`8`	`7`	`oraclejdk_state: present`
`9`	`8`
`10`	`9`	`oraclejdk_dl_dir: /tmp/oraclejdk # temp directory in which the archives are stored`