From: Alfredo Deza <adeza@redhat.com>
Date: Fri, 4 Mar 2016 12:33:34 +0000 (-0500)
Subject: port the java jdk fix to the slave template as well
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F334%2Fhead;p=ceph-build.git

port the java jdk fix to the slave template as well

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

diff --git a/ansible/slave.yml.j2 b/ansible/slave.yml.j2
index 5edebe8c..3900d723 100644
--- a/ansible/slave.yml.j2
+++ b/ansible/slave.yml.j2
@@ -102,6 +102,10 @@
         - libffi-dev
       when: ansible_pkg_mgr  == "apt"
 
+    - name: correct java version selected
+      alternatives: name=java path=/usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'precise'
+
     - name: ensure the rpmmacros file exists to fix centos builds
       file: path="/home/{{ jenkins_user }}/.rpmmacros" owner="{{ jenkins_user }}" state=touch