ansible: Changes for Xenial support

diff --git a/automation/ansible/roles/common/vars/Debian.yml b/automation/ansible/roles/common/vars/Debian.yml
index cf95a929736f39787726c741762883deb0038814..7ef3bb8f239355110c0922b3f0a67afc57846a4c 100644 (file)
--- 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 9ecb86dfd13e9a20688bfd51f5777b76715a458e..1f66fdffbb28cfde050cc376e9dc1428c2df9870 100644 (file)
--- 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 bb85ca3fa2e9903daa6a270aa45c4e248e1afcf0..7a881d44e6f18f57ab11d96e3e71230553641cfb 100644 (file)
--- 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