]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
slave.yml: condition opnjdk installs for xenial 384/head
authorAlfredo Deza <adeza@redhat.com>
Wed, 4 May 2016 11:20:30 +0000 (07:20 -0400)
committerAlfredo Deza <adeza@redhat.com>
Wed, 4 May 2016 11:21:32 +0000 (07:21 -0400)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
ansible/slave.yml

index 9b73ef3d8f5adf9048ffd15a35dbdec826ac84d5..15d635a2fbdc116c64e4f1952b64b022d07936c0 100644 (file)
       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: