From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 2 Jun 2016 22:01:11 +0000 (-0400)
Subject: ansible: Changes for Xenial support
X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;h=c60ff8eb15ce85e1a6fff392511a0abf27328885;p=lttng-ci.git

ansible: Changes for Xenial support
---

diff --git a/automation/ansible/roles/common/vars/Debian.yml b/automation/ansible/roles/common/vars/Debian.yml
index cf95a92..7ef3bb8 100644
--- a/automation/ansible/roles/common/vars/Debian.yml
+++ b/automation/ansible/roles/common/vars/Debian.yml
@@ -1,7 +1,7 @@
 ---
 __common_packages:
   - sudo
-  - openjdk-7-jdk
+  - default-jdk-headless
   - git
   - vim
   - tree
diff --git a/automation/ansible/roles/tracecompass/tasks/setup-Debian.yml b/automation/ansible/roles/tracecompass/tasks/setup-Debian.yml
index 9ecb86d..1f66fdf 100644
--- a/automation/ansible/roles/tracecompass/tasks/setup-Debian.yml
+++ b/automation/ansible/roles/tracecompass/tasks/setup-Debian.yml
@@ -2,8 +2,8 @@
 - name: install pycurl package in order to use the apt_repository module
   apt: pkg=python-pycurl state=present
 
-- name: Add OpenJDK ppa.
-  apt_repository: repo='ppa:openjdk-r/ppa'
+#- name: Add OpenJDK ppa.
+#  apt_repository: repo='ppa:openjdk-r/ppa'
 
 - name: Update apt cache.
   apt: update_cache=yes cache_valid_time=86400
diff --git a/automation/ansible/roles/tracecompass/vars/Debian.yml b/automation/ansible/roles/tracecompass/vars/Debian.yml
index bb85ca3..7a881d4 100644
--- a/automation/ansible/roles/tracecompass/vars/Debian.yml
+++ b/automation/ansible/roles/tracecompass/vars/Debian.yml
@@ -1,6 +1,5 @@
 ---
 __tracecompass_packages:
-  - openjdk-7-jdk
   - openjdk-8-jdk
   - metacity
   - xfonts-100dpi