From: Alfredo Deza <adeza@redhat.com>
Date: Wed, 4 May 2016 11:20:30 +0000 (-0400)
Subject: slave.yml: condition opnjdk installs for xenial
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=eb53a9ca88143630bb7cf59b8d25887b4e18b1e1;p=ceph-build.git

slave.yml: condition opnjdk installs for xenial

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

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: