From: Michael Jeanson <mjeanson@efficios.com>
Date: Fri, 19 Feb 2016 23:00:14 +0000 (-0500)
Subject: Fix cross-compilers role
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=0eb6d73e5bb2566adfdae0277dda11424cce76f3;p=lttng-ci.git

Fix cross-compilers role
---

diff --git a/automation/ansible/roles/cross-compilers/tasks/main.yml b/automation/ansible/roles/cross-compilers/tasks/main.yml
index 1126124..4a25dfc 100644
--- a/automation/ansible/roles/cross-compilers/tasks/main.yml
+++ b/automation/ansible/roles/cross-compilers/tasks/main.yml
@@ -3,10 +3,10 @@
 - name: Include OS-specific variables.
   include_vars: "{{ ansible_os_family }}.yml"
 
-- name: Define common_packages.
+- name: Define cross-compilers_packages.
   set_fact:
-    common_packages: "{{ __common_packages | list }}"
-  when: common_packages is not defined
+    cross-compilers_packages: "{{ __cross-compilers_packages | list }}"
+  when: cross-compilers_packages is not defined
 
 # Setup/install tasks.
 - include: setup-RedHat.yml
diff --git a/automation/ansible/roles/cross-compilers/tasks/setup-Debian.yml b/automation/ansible/roles/cross-compilers/tasks/setup-Debian.yml
index 878efd1..553d777 100644
--- a/automation/ansible/roles/cross-compilers/tasks/setup-Debian.yml
+++ b/automation/ansible/roles/cross-compilers/tasks/setup-Debian.yml
@@ -2,6 +2,6 @@
 - name: Update apt cache.
   apt: update_cache=yes cache_valid_time=86400
 
-- name: Ensure common packages are installed.
+- name: Ensure cross-compilers packages are installed.
   apt: "name={{ item }} state=installed"
-  with_items: common_packages
+  with_items: cross-compilers_packages
diff --git a/automation/ansible/roles/cross-compilers/tasks/setup-RedHat.yml b/automation/ansible/roles/cross-compilers/tasks/setup-RedHat.yml
index 70f37de..08eb62a 100644
--- a/automation/ansible/roles/cross-compilers/tasks/setup-RedHat.yml
+++ b/automation/ansible/roles/cross-compilers/tasks/setup-RedHat.yml
@@ -1,6 +1,6 @@
 ---
-- name: Ensure common packages are installed.
+- name: Ensure cross-compilers packages are installed.
   yum:
     name: "{{ item }}"
     state: installed
-  with_items: common_packages
+  with_items: cross-compilers_packages
diff --git a/automation/ansible/roles/cross-compilers/vars/Debian.yml b/automation/ansible/roles/cross-compilers/vars/Debian.yml
index 06193ad..9395e90 100644
--- a/automation/ansible/roles/cross-compilers/vars/Debian.yml
+++ b/automation/ansible/roles/cross-compilers/vars/Debian.yml
@@ -1,5 +1,5 @@
 ---
-__common_packages:
+__cross-compilers_packages:
   - gcc-aarch64-linux-gnu
   - gcc-powerpc64le-linux-gnu
   - gcc-arm-linux-gnueabihf
diff --git a/automation/ansible/roles/cross-compilers/vars/RedHat.yml b/automation/ansible/roles/cross-compilers/vars/RedHat.yml
index 35f8482..c1a281f 100644
--- a/automation/ansible/roles/cross-compilers/vars/RedHat.yml
+++ b/automation/ansible/roles/cross-compilers/vars/RedHat.yml
@@ -1,4 +1,3 @@
 ---
 # TODO
-__common_packages:
-  - java-1.7.0-openjdk-headless
+__cross-compilers_packages: