From: Alfredo Deza <adeza@redhat.com>
Date: Thu, 31 Mar 2016 16:29:20 +0000 (-0400)
Subject: set java conf for wheezy too
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=03889cca52a00558375521cc65491196684cc498;p=ceph-build.git

set java conf for wheezy too

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

diff --git a/ansible/slave.yml b/ansible/slave.yml
index 2d1bf62b..832ef944 100644
--- a/ansible/slave.yml
+++ b/ansible/slave.yml
@@ -78,10 +78,13 @@
         - libevent-dev
         - 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'
+      alternatives: name=java path=/usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java
+      when:
+        (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'precise') or
+        (ansible_distribution == 'Debian' and ansible_distribution_release == 'wheezy')
+
 
     - name: install python-jenkins
       sudo: true
diff --git a/ansible/slave.yml.j2 b/ansible/slave.yml.j2
index 3900d723..18a0b210 100644
--- a/ansible/slave.yml.j2
+++ b/ansible/slave.yml.j2
@@ -104,7 +104,9 @@
 
     - 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'
+      when:
+        (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'precise') or
+        (ansible_distribution == 'Debian' and ansible_distribution_release == 'wheezy')
 
     - name: ensure the rpmmacros file exists to fix centos builds
       file: path="/home/{{ jenkins_user }}/.rpmmacros" owner="{{ jenkins_user }}" state=touch