Merge pull request #40 from ccdc-opensource/use-role-dependencies

Use role dependencies instead of explicit `include_role`s

Author: florianpiesche

meta/main.yml

@@ -36,4 +36,5 @@ galaxy_info:
     - desktop
     - integrationtesting
 
-dependencies: []
+dependencies:
+  - role: ccdc.package_manager_configuration

tasks/AlmaLinux.yml

@@ -1,8 +1,4 @@
 ---
-- name: Set up package managers for required tools
-  ansible.builtin.include_role:
-    name: ccdc.package_manager_configuration
-
 - name: Install desktop environment
   ansible.builtin.package:
     name: "{{ package }}"

tasks/Darwin.yml

@@ -26,12 +26,6 @@
     homebrew_installed_packages:
       - xfreebird/utils/kcpassword
 
-# - name: Add kcpassword utility for autologin
-#   community.general.homebrew:
-#     name: kcpassword
-#     state: present
-#   become: true
-
 - name: Set autoLoginUser for current user
   community.general.osx_defaults:
     domain: /Library/Preferences/com.apple.loginwindow

tasks/RedHat.yml

@@ -1,8 +1,4 @@
 ---
-- name: Set up package managers for required tools
-  ansible.builtin.include_role:
-    name: ccdc.package_manager_configuration
-
 - name: Install desktop environment
   ansible.builtin.package:
     name: "{{ package }}"

tasks/Windows.yml

@@ -6,10 +6,18 @@
   become: true
 
 - name: Enable autologon for vagrant
-  ansible.windows.win_command: powershell.exe Start-Process -FilePath "C:\\ProgramData\\chocolatey\\bin\\Autologon.exe" -ArgumentList '"/accepteula" vagrant . {{ windows_autologon_password }}'
+  ansible.windows.win_command: >
+    powershell.exe Start-Process
+      -FilePath "C:\\ProgramData\\chocolatey\\bin\\Autologon.exe"
+      -ArgumentList '"/accepteula" vagrant . {{ windows_autologon_password }}'
 
 - name: Disable screen saver
-  ansible.windows.win_shell: Set-ItemProperty "HKCU:\Control Panel\Desktop" -Name ScreenSaveActive -Value 0 -Type DWord
+  ansible.windows.win_shell: >
+    Set-ItemProperty
+      "HKCU:\Control Panel\Desktop"
+      -Name ScreenSaveActive
+      -Value 0
+      -Type DWord
 
 - name: Disable monitor and standby idle timeout
   ansible.windows.win_command: powercfg -x -{{ timeout }} 0

tasks/main.yml

@@ -1,5 +1,5 @@
 ---
-- name: Set OS-specific variables for {{ ansible_os_family }}-{{ ansible_distribution }}-{{ ansible_distribution_major_version }}
+- name: Set OS-specific variables for {{ ansible_os_family }}-{{ ansible_distribution }}-{{ ansible_distribution_major_version }}  # noqa: name[template]
   ansible.builtin.include_vars: "{{ item }}"
   with_first_found:
     - files:
@@ -11,7 +11,7 @@
       skip: true
   tags: vars
 
-- name: Set up desktop environment on {{ ansible_os_family }}-{{ ansible_distribution }}-{{ ansible_distribution_major_version }}
+- name: Set up desktop environment on {{ ansible_os_family }}-{{ ansible_distribution }}-{{ ansible_distribution_major_version }}  # noqa: name[template]
   ansible.builtin.include_tasks: "{{ item }}"
   with_first_found:
     - files:

vars/macos.yml

@@ -6,7 +6,7 @@ homebrew_user: "{{ ansible_user }}"
 homebrew_taps:
   - name: xfreebird/utils
   - name: xcodesorg/made
-current_user: "{{ lookup('env','USER') }}"
+current_user: "{{ lookup('env', 'USER') }}"
 
 homebrew_installed_packages:
   - kcpassword