From 9915b61dbe6d1e0be2e9dfa1d32ba8e6e4754c88 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Tue, 18 Dec 2018 17:26:01 +0100
Subject: [PATCH] Make java version configurable
---
defaults/main.yml | 3 +++
tasks/main.yml | 8 ++++----
2 files changed, 7 insertions(+), 4 deletions(-)
create mode 100644 defaults/main.yml
diff --git a/defaults/main.yml b/defaults/main.yml
new file mode 100644
index 0000000..320a5ef
--- /dev/null
+++ b/defaults/main.yml
@@ -0,0 +1,3 @@
+java_version: '8'
+java_license: 'v1-1'
+java_repo: 'webupd8team'
diff --git a/tasks/main.yml b/tasks/main.yml
index f7f824d..bd6d344 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -9,19 +9,19 @@
- name: "Apt Repository"
apt_repository:
- repo='deb http://ppa.launchpad.net/webupd8team/java/ubuntu {{ ansible_distribution_release }} main'
+ repo='deb http://ppa.launchpad.net/{{ java_repo }}/java/ubuntu {{ ansible_distribution_release }} main'
state='present'
mode='644'
- name: "Accept License"
shell: '{{ item }}'
with_items:
- - 'echo debconf shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections'
- - 'echo debconf shared/accepted-oracle-license-v1-1 seen true | /usr/bin/debconf-set-selections'
+ - 'echo debconf shared/accepted-oracle-license-{{ java_license }} select true | /usr/bin/debconf-set-selections'
+ - 'echo debconf shared/accepted-oracle-license-{{ java_license }} seen true | /usr/bin/debconf-set-selections'
- name: "Install Agent"
apt:
- pkg='oracle-java8-installer'
+ pkg='oracle-java{{ java_version }}-installer'
state='present'
update_cache=yes
force=yes
--
GitLab