Give the option to not force the Zulu repository

This commit is contained in:
Andrea Dell'Amico 2020-12-14 12:13:15 +01:00
parent d40a337f9f
commit 12c752fbdb
2 changed files with 4 additions and 1 deletions

View File

@ -7,6 +7,7 @@ openjdk_version:
- '{{ openjdk_default }}'
dismissed_openjdk_ppa: 'ppa:openjdk-r/ppa'
openjdk_force_system_jdk_on_trusty: False
openjdk_zulu_repo_install: False
openjdk_zulu_repo_key_id: '0xB1998361219BD9C9'
openjdk_zulu_repository: 'deb http://repos.azulsystems.com/{{ ansible_distribution | lower }} stable main'

View File

@ -9,7 +9,9 @@
- name: Check if we must use the Zulu repository
set_fact:
openjdk_zulu_repo_install: True
when: ansible_distribution_major_version <= '16'
when:
- ansible_distribution_major_version <= '16'
- not openjdk_force_system_jdk_on_trusty
tags: [ 'jdk', 'openjdk' ]