From 4572b12c8ecace55d61ba24e17021ee953caac14 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 19 Feb 2016 18:04:07 -0500 Subject: [PATCH] Use underscores in variable names --- automation/ansible/roles/cross-compilers/tasks/main.yml | 6 +++--- .../ansible/roles/cross-compilers/tasks/setup-Debian.yml | 2 +- .../ansible/roles/cross-compilers/tasks/setup-RedHat.yml | 2 +- automation/ansible/roles/cross-compilers/vars/Debian.yml | 2 +- automation/ansible/roles/cross-compilers/vars/RedHat.yml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/automation/ansible/roles/cross-compilers/tasks/main.yml b/automation/ansible/roles/cross-compilers/tasks/main.yml index 4a25dfc..7a95431 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 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 553d777..9dff028 100644 --- 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 08eb62a..d70ae29 100644 --- 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 9395e90..8b8bbe9 100644 --- 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 c1a281f..75f383c 100644 --- 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: -- 2.34.1