Use underscores in variable names

diff --git a/automation/ansible/roles/cross-compilers/tasks/main.yml b/automation/ansible/roles/cross-compilers/tasks/main.yml
index 4a25dfc0250cefb9e8b3936e3e3d0a65293bc959..7a9543146dfd7aa18c469c2c3dfc134d0faea58a 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 cross-compilers_packages.
+- name: Define cross_compilers_packages.
   set_fact:
-    cross-compilers_packages: "{{ __cross-compilers_packages | list }}"
-  when: cross-compilers_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 553d7774343d60aafd68181e0aea166bd4db59ba..9dff0288a29d20ec42406c8906d88ff0fc60a37b 100644 (file)
--- a/automation/ansible/roles/cross-compilers/tasks/setup-Debian.yml
+++ b/automation/ansible/roles/cross-compilers/tasks/setup-Debian.yml
@@ -4,4 +4,4 @@
 
 - name: Ensure cross-compilers packages are installed.
   apt: "name={{ item }} state=installed"
-  with_items: cross-compilers_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 08eb62a751ea5b23da7d31f9d4409f258781b64f..d70ae29da470d636dc533be8e277f2690ae9405e 100644 (file)
--- a/automation/ansible/roles/cross-compilers/tasks/setup-RedHat.yml
+++ b/automation/ansible/roles/cross-compilers/tasks/setup-RedHat.yml
@@ -3,4 +3,4 @@
   yum:
     name: "{{ item }}"
     state: installed
-  with_items: cross-compilers_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 9395e90b0eb531b798b1b58fecd03f16e408109b..8b8bbe9d15c882d755cc3590a3a7729a56573274 100644 (file)
--- a/automation/ansible/roles/cross-compilers/vars/Debian.yml
+++ b/automation/ansible/roles/cross-compilers/vars/Debian.yml
@@ -1,5 +1,5 @@
 ---
-__cross-compilers_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 c1a281f7ffc91ab1b387aa3e2754b6446b52a2aa..75f383c9db412e77e3959af5b3dc4e2a8c138dc7 100644 (file)
--- a/automation/ansible/roles/cross-compilers/vars/RedHat.yml
+++ b/automation/ansible/roles/cross-compilers/vars/RedHat.yml
@@ -1,3 +1,3 @@
 ---
 # TODO
-__cross-compilers_packages:
+__cross_compilers_packages: