From 9894ddceafe5ae59eb07abd4490268f434e7baee Mon Sep 17 00:00:00 2001 From: Travis Johnson Date: Mon, 4 Mar 2024 22:32:28 -0500 Subject: [PATCH] Resolved the 'var-naming[no-role-prefix]' linting error --- defaults/main.yml | 12 ++++++------ tasks/main.yml | 12 ++++++------ vars/main.yml | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index c79c48d..f897964 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -6,22 +6,22 @@ ansible_become: yes ansible_become_method: sudo -pi_hostname: raspberrypihostname +headless_raspi_config_pi_hostname: raspberrypihostname -pi_timezone: "US/Eastern" +headless_raspi_config_pi_timezone: "US/Eastern" # https://wiki.debian.org/TimeZoneChanges -pi_locale_setting: en_US.UTF-8 +headless_raspi_config_pi_locale_setting: en_US.UTF-8 # https://wiki.debian.org/Locale -pi_keyboard_layout: us +headless_raspi_config_pi_keyboard_layout: us # https://wiki.debian.org/Keyboard -pi_bootup_behavior: B1 +headless_raspi_config_pi_bootup_behavior: B1 # B1 - "Text console, requiring user to login" # B2 - "Text console, automatically logged in as '$USER' user" # B3 - "Desktop GUI, requiring user to login" ( NOT APPLICABLE TO RPI LITE OS ) # B4 - "Desktop GUI, automatically logged in as '$USER' user" ( NOT APPLICABLE TO RPI LITE OS ) -# The `do_memory_split()` function is now obsolete, which effectively makes `pi_memory_split:` variable invalid. +# The `do_memory_split()` function is now obsolete, which effectively makes `headless_raspi_config_pi_memory_split:` variable invalid. # SOURCE: https://github.com/RPi-Distro/raspi-config/commit/1089abb821ee0f32c8451fcd62b9df88f047ea01 diff --git a/tasks/main.yml b/tasks/main.yml index 1b40364..6cab8d3 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -9,21 +9,21 @@ ansible.builtin.apt: name: "{{ item }}" state: present - loop: "{{ pi_required_packages }}" + loop: "{{ headless_raspi_config_pi_required_packages }}" - name: Configure several `raspi_config nonint` settings in series ansible.builtin.include_tasks: raspi_config.yml loop: # Set up timezone to match your location - - { raspi_config_nonint_cmd: 'do_change_timezone', cmd_argument: "{{ pi_timezone }}" } + - { raspi_config_nonint_cmd: 'do_change_timezone', cmd_argument: "{{ headless_raspi_config_pi_timezone }}" } # Set up language and regional settings to match your location - - { raspi_config_nonint_cmd: 'do_change_locale', cmd_argument: "{{ pi_locale_setting }}" } + - { raspi_config_nonint_cmd: 'do_change_locale', cmd_argument: "{{ headless_raspi_config_pi_locale_setting }}" } # Set the keyboard layout to match your keyboard - - { raspi_config_nonint_cmd: 'do_configure_keyboard', cmd_argument: "{{ pi_keyboard_layout }}" } + - { raspi_config_nonint_cmd: 'do_configure_keyboard', cmd_argument: "{{ headless_raspi_config_pi_keyboard_layout }}" } # Set the hostname - - { raspi_config_nonint_cmd: 'do_hostname', cmd_argument: "{{ pi_hostname }}" } + - { raspi_config_nonint_cmd: 'do_hostname', cmd_argument: "{{ headless_raspi_config_pi_hostname }}" } # Enabling autologin at the command-line console upon booting up - - { raspi_config_nonint_cmd: 'do_boot_behaviour', cmd_argument: "{{ pi_bootup_behavior }}" } + - { raspi_config_nonint_cmd: 'do_boot_behaviour', cmd_argument: "{{ headless_raspi_config_pi_bootup_behavior }}" } - name: Attempting to disable experimental desktop GL driver (using original legacy non-GL desktop driver) ansible.builtin.lineinfile: diff --git a/vars/main.yml b/vars/main.yml index 02df478..56d3639 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,5 +1,5 @@ --- # vars file for headless-raspi-config-ansible -pi_required_packages: +headless_raspi_config_pi_required_packages: - gldriver-test - libgl1-mesa-dri \ No newline at end of file