From 04c4f190e828ff95c7f9e2692772b2b8d431df9b Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Thu, 18 Dec 2014 20:13:03 +0000
Subject: [PATCH] Split out java install for jenkins so it doesn't blow up on
 rhel7 builder.

---
 playbooks/groups/jenkins-cloud.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/playbooks/groups/jenkins-cloud.yml b/playbooks/groups/jenkins-cloud.yml
index 1f5e4e9646..c7b87df97e 100644
--- a/playbooks/groups/jenkins-cloud.yml
+++ b/playbooks/groups/jenkins-cloud.yml
@@ -45,7 +45,6 @@
     - vim
     - dejavu-s\*
     - fontconfig
-    - java-1.8.0-openjdk
     - httpd
     - openssh-clients
     - git
@@ -53,6 +52,14 @@
     tags:
     - packages
 
+  - name: install java-1.8.0 except on rhel7 for jenkins
+    action: yum state=present pkg={{ item }}
+    with_items:
+    - java-1.8.0-openjdk
+    tags:
+    - packages
+    when: ansible_distribution_major_version != '7'
+
   - name: add jenkins proxy config file for apache
     action: copy src="{{ files }}/jenkins/master/jenkins-apache.conf"
             dest=/etc/httpd/conf.d/jenkins-apache.conf