From eb53a9ca88143630bb7cf59b8d25887b4e18b1e1 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Wed, 4 May 2016 07:20:30 -0400 Subject: [PATCH] slave.yml: condition opnjdk installs for xenial Signed-off-by: Alfredo Deza --- ansible/slave.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/ansible/slave.yml b/ansible/slave.yml index 9b73ef3d..15d635a2 100644 --- a/ansible/slave.yml +++ b/ansible/slave.yml @@ -112,6 +112,19 @@ when: ansible_pkg_mgr == "apt" apt_key: id=2B90D010 url=https://ftp-master.debian.org/keys/archive-key-8.asc keyring=/etc/apt/trusted.gpg.d/jessie.gpg state=present + - name: Install openjdk-7-jre + apt: name=openjdk-7-jre state=present + when: + ansible_distribution_release in ['precise', 'trusty', 'wheezy', 'jessie'] + + - name: Install default openjdk for Xenial only + apt: name={{ item }} state=present + with_items: + - default-jdk + - default-jre + when: + ansible_distribution_release == 'xenial' + - name: correct java version selected alternatives: name=java path=/usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java when: -- 2.39.5