diff --git a/defaults/main.yml b/defaults/main.yml new file mode 100644 index 0000000000000000000000000000000000000000..320a5ef50c9ae828d67c1b31e5409912f8c1d5f7 --- /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 f7f824d7c86073e23fcc1197d56d6e9edabd618d..bd6d3447840baf1d90a015017d0d4463d58fec64 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