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 11261244f46cef803cc0b1f7634abe098b98bd84..4a25dfc0250cefb9e8b3936e3e3d0a65293bc959 100644 (file)
--- 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 878efd122dac7115fb3ed6e7890d406630a67197..553d7774343d60aafd68181e0aea166bd4db59ba 100644 (file)
--- 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 70f37dec0cb78111dbda5d89923fd52005efada2..08eb62a751ea5b23da7d31f9d4409f258781b64f 100644 (file)
--- 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 06193ad308db0507e94a6cbec0e8bd696c06064e..9395e90b0eb531b798b1b58fecd03f16e408109b 100644 (file)
--- 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 35f8482e5168e8a1db49d1e40b6051cd9c3539be..c1a281f7ffc91ab1b387aa3e2754b6446b52a2aa 100644 (file)
--- 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: