All the roles dependencies to Oracle JDK are now dependencies to OpenJDK.

This commit is contained in:
Andrea Dell'Amico 2019-04-22 18:48:15 +02:00
parent d2a999cedf
commit 8c574f222b
8 changed files with 15 additions and 23 deletions

View File

@ -1,4 +1,3 @@
---
dependencies:
- { role: '../../../library/roles/oracle-jdk', when: openjdk_install is not defined or not openjdk_install }
- { role: '../../../library/roles/openjdk', when: openjdk_install | default(False) }
- { role: '../../../library/roles/openjdk' }

View File

@ -1,5 +1,4 @@
---
dependencies:
- { role: '../../library/roles/oracle-jdk', when: openjdk_install is not defined or not openjdk_install }
- { role: '../../library/roles/openjdk', when: openjdk_install | default(False) }
- { role: '../../library/roles/openjdk' }
- { role: '../../library/roles/nginx', when: cdh_zeppelin_dedicated_node }

View File

@ -1,4 +1,8 @@
---
#
# 04/19/2019. This role cannot be used anymore as Oracle changed policies
#
# Supported versions: 8,9
jdk_default: 8
# jdk_version is a dictionary because it's possible to install more than one version

View File

@ -1,4 +1,10 @@
---
- block:
- name: Oracle JDK cannot be installed anymore, unless you are able to provide a local tar file distribution
fail:
msg: "Use the openjdk role instead"
when: not jdk_use_tarfile
- block:
- name: setup the Oracle JDK repository on ubuntu
apt_repository: repo='{{ jdk_ubuntu_ppa }}' state=present update_cache=yes
@ -50,16 +56,3 @@
when: jdk_use_tarfile
tags: [ 'oracle_jdk', 'jdk' ]
- block:
- name: Install a default keyring that includes the Letsencrypt X3 cross signed CA and the INFN CA certificate
copy: src=cacerts-jdk7 dest={{ jdk_java_home }}/jre/lib/security/cacerts owner=root group=root mode=0644
when: jdk_default <= 7
tags: [ 'oracle_jdk', 'jdk', 'jdk_cacert' ]
- block:
- name: Change the default keyring. Insert the INFN CA certificate
java_cert: cert_path=/usr/local/share/ca-certificates/infn-ca-2015.crt keystore_path={{ jdk_java_home }}/jre/lib/security/cacerts keystore_pass=changeit cert_alias=infn-ca-2015-2030 state=present
when: jdk_default >= 8
tags: [ 'oracle_jdk', 'jdk', 'jdk_cacert' ]

View File

@ -1,4 +1,3 @@
---
dependencies:
- { role: '../../library/roles/oracle-jdk', when: openjdk_install is not defined or not openjdk_install }
- { role: '../../library/roles/openjdk', when: openjdk_install | default(False) }
- { role: '../../library/roles/openjdk' }

View File

@ -1,4 +1,3 @@
---
dependencies:
- { role: '../../library/roles/oracle-jdk', when: openjdk_install is not defined or not openjdk_install }
- { role: '../../library/roles/openjdk', when: openjdk_install | default(False) }
- { role: '../../library/roles/openjdk' }

View File

@ -1,6 +1,6 @@
---
#dependencies:
# - role: '../../library/roles/oracle-jdk'
# - role: '../../library/roles/openjdk'
# - role: '../../library/roles/apache'
# - role: '../../library/roles/tomcat'
# when: tomcat_m_instances is not defined

View File

@ -1,4 +1,3 @@
---
dependencies:
#- { role: '../../library/roles/oracle-jdk', when: openjdk_install is not defined or not openjdk_install }
- { role: '../../library/roles/openjdk' }