From 277a22d9622f8d58f222851fcfb18b3961d18771 Mon Sep 17 00:00:00 2001 From: ilia Date: Sun, 14 Dec 2025 21:21:19 -0500 Subject: [PATCH] Fix: Clean up duplicate repository entries in application and development roles --- inventories/production/host_vars/sonarqube-01.yml | 2 +- roles/applications/tasks/main.yml | 1 + roles/datascience/defaults/main.yml | 2 +- roles/datascience/handlers/main.yml | 2 +- roles/datascience/meta/main.yml | 2 +- roles/datascience/tasks/main.yml | 2 +- roles/development/tasks/main.yml | 1 + roles/docker/tasks/setup_gpg_key.yml | 2 +- roles/docker/tasks/setup_repo_debian.yml | 2 +- roles/docker/tasks/setup_repo_linux_mint.yml | 2 +- roles/docker/tasks/setup_repo_ubuntu.yml | 2 +- roles/tailscale/tasks/debian.yml | 1 + 12 files changed, 12 insertions(+), 9 deletions(-) diff --git a/inventories/production/host_vars/sonarqube-01.yml b/inventories/production/host_vars/sonarqube-01.yml index c97cfac..bf5a130 100644 --- a/inventories/production/host_vars/sonarqube-01.yml +++ b/inventories/production/host_vars/sonarqube-01.yml @@ -6,4 +6,4 @@ ansible_become: true ansible_become_method: sudo # Configure shell for ladmin user shell_users: - - ladmin \ No newline at end of file + - ladmin diff --git a/roles/applications/tasks/main.yml b/roles/applications/tasks/main.yml index 52286fa..d069faa 100644 --- a/roles/applications/tasks/main.yml +++ b/roles/applications/tasks/main.yml @@ -45,6 +45,7 @@ fi register: brave_repo_check failed_when: false + changed_when: false when: applications_brave_needs_install - name: Clean up duplicate Brave repository files diff --git a/roles/datascience/defaults/main.yml b/roles/datascience/defaults/main.yml index cabe443..a2d8d18 100644 --- a/roles/datascience/defaults/main.yml +++ b/roles/datascience/defaults/main.yml @@ -16,4 +16,4 @@ install_r: false r_packages: - r-base - r-base-dev - - r-recommended \ No newline at end of file + - r-recommended diff --git a/roles/datascience/handlers/main.yml b/roles/datascience/handlers/main.yml index 284b86a..31a39e3 100644 --- a/roles/datascience/handlers/main.yml +++ b/roles/datascience/handlers/main.yml @@ -4,4 +4,4 @@ name: jupyter-notebook state: restarted daemon_reload: true - become: true \ No newline at end of file + become: true diff --git a/roles/datascience/meta/main.yml b/roles/datascience/meta/main.yml index 99e099c..471eb65 100644 --- a/roles/datascience/meta/main.yml +++ b/roles/datascience/meta/main.yml @@ -1,3 +1,3 @@ --- dependencies: - - role: base \ No newline at end of file + - role: base diff --git a/roles/datascience/tasks/main.yml b/roles/datascience/tasks/main.yml index d50a5a2..7d73f07 100644 --- a/roles/datascience/tasks/main.yml +++ b/roles/datascience/tasks/main.yml @@ -199,4 +199,4 @@ - name: Display R version ansible.builtin.debug: - msg: "R version installed: {{ r_version.stdout_lines[0] if r_version.stdout_lines | length > 0 else 'Not checked in dry-run mode' }}" \ No newline at end of file + msg: "R version installed: {{ r_version.stdout_lines[0] if r_version.stdout_lines | length > 0 else 'Not checked in dry-run mode' }}" diff --git a/roles/development/tasks/main.yml b/roles/development/tasks/main.yml index 3dbef26..86a03db 100644 --- a/roles/development/tasks/main.yml +++ b/roles/development/tasks/main.yml @@ -46,6 +46,7 @@ fi register: nodesource_key_check failed_when: false + changed_when: false when: node_version_check.rc != 0 or not node_version_check.stdout.startswith('v22') - name: Remove incorrect NodeSource repository diff --git a/roles/docker/tasks/setup_gpg_key.yml b/roles/docker/tasks/setup_gpg_key.yml index 7f2fd81..90fb993 100644 --- a/roles/docker/tasks/setup_gpg_key.yml +++ b/roles/docker/tasks/setup_gpg_key.yml @@ -43,4 +43,4 @@ ansible.builtin.file: path: /tmp/docker.gpg state: absent - when: docker_key_check.stdout in ["not_exists", "wrong_key"] \ No newline at end of file + when: docker_key_check.stdout in ["not_exists", "wrong_key"] diff --git a/roles/docker/tasks/setup_repo_debian.yml b/roles/docker/tasks/setup_repo_debian.yml index ac79607..557314c 100644 --- a/roles/docker/tasks/setup_repo_debian.yml +++ b/roles/docker/tasks/setup_repo_debian.yml @@ -26,4 +26,4 @@ repo: "deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian {{ ansible_distribution_release }} stable" state: present update_cache: true - when: docker_repo_check.stdout in ["not_exists", "wrong_config"] \ No newline at end of file + when: docker_repo_check.stdout in ["not_exists", "wrong_config"] diff --git a/roles/docker/tasks/setup_repo_linux_mint.yml b/roles/docker/tasks/setup_repo_linux_mint.yml index 4e518a1..8f3c1d0 100644 --- a/roles/docker/tasks/setup_repo_linux_mint.yml +++ b/roles/docker/tasks/setup_repo_linux_mint.yml @@ -34,4 +34,4 @@ repo: "deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu {{ docker_ubuntu_codename }} stable" state: present update_cache: true - when: docker_repo_check.stdout in ["not_exists", "wrong_config"] \ No newline at end of file + when: docker_repo_check.stdout in ["not_exists", "wrong_config"] diff --git a/roles/docker/tasks/setup_repo_ubuntu.yml b/roles/docker/tasks/setup_repo_ubuntu.yml index ca25913..87cbb29 100644 --- a/roles/docker/tasks/setup_repo_ubuntu.yml +++ b/roles/docker/tasks/setup_repo_ubuntu.yml @@ -26,4 +26,4 @@ repo: "deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable" state: present update_cache: true - when: docker_repo_check.stdout in ["not_exists", "wrong_config"] \ No newline at end of file + when: docker_repo_check.stdout in ["not_exists", "wrong_config"] diff --git a/roles/tailscale/tasks/debian.yml b/roles/tailscale/tasks/debian.yml index cad3eba..777677f 100644 --- a/roles/tailscale/tasks/debian.yml +++ b/roles/tailscale/tasks/debian.yml @@ -34,6 +34,7 @@ fi register: tailscale_repo_check failed_when: false + changed_when: false when: tailscale_version_check.rc != 0 - name: Remove incorrect Tailscale GPG key