From d2a999cedf2d8628e5209de3573ea5840e06ac4e Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Mon, 22 Apr 2019 18:34:48 +0200 Subject: [PATCH] OpenJDK role: Remove the Oracle PPA. --- openjdk/defaults/main.yml | 2 ++ openjdk/tasks/main.yml | 3 +++ 2 files changed, 5 insertions(+) diff --git a/openjdk/defaults/main.yml b/openjdk/defaults/main.yml index d74d0b4b..79c7cf2e 100644 --- a/openjdk/defaults/main.yml +++ b/openjdk/defaults/main.yml @@ -19,3 +19,5 @@ openjdk_pkgs: - jdk-headless # - jre # - jdk + +oracle_jdk_ubuntu_ppa: 'ppa:webupd8team/java' diff --git a/openjdk/tasks/main.yml b/openjdk/tasks/main.yml index 25f5b86c..6b076941 100644 --- a/openjdk/tasks/main.yml +++ b/openjdk/tasks/main.yml @@ -3,6 +3,9 @@ - name: Remove the openjdk-r ppa. It is not maintained anymore apt_repository: repo='{{ dismissed_openjdk_ppa }}' update_cache=yes state=absent + - name: Remove the Oracle JDK PPA + apt_repository: repo='{{ oracle_jdk_ubuntu_ppa }}' state=absent + - name: Check if we must use the Zulu repository set_fact: openjdk_zulu_repo_install: True