From 856ebe7c0cd444e95b1b0474d970f6132623d516 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Sat, 22 Nov 2025 19:37:44 +0100 Subject: [PATCH 1/2] Remove quotes around true/false New ansible needs boolean values in when expressions. --- defaults/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index b9f17b0..a300d91 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -106,10 +106,10 @@ cvmfs_config_repo: {} # CVMFS_CONFIG_REPOSITORY is not supported on Debian < 9, Ubuntu LTS < 18.04 cvmfs_config_repo_supported: >- {{ - 'true' if ansible_os_family != 'Debian' else ( - 'true' if (ansible_distribution == 'Debian' and ansible_distribution_version is version('9', '>=')) else ( - 'true' if (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('18.04', '>=')) else - 'false')) + true if ansible_os_family != 'Debian' else ( + true if (ansible_distribution == 'Debian' and ansible_distribution_version is version('9', '>=')) else ( + true if (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('18.04', '>=')) else + false)) }} # When to update the GeoIP database, if cvmfs_geo_license_key is defined From f1dd05b36f8ac5ad2419ac85e0793f959b4c1728 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Sat, 22 Nov 2025 19:50:48 +0100 Subject: [PATCH 2/2] Remove old cvmfs api repo on modern ubuntu Fixes ``` root@gat-1:/etc/apt# apt update E: Conflicting values set for option ALLOW_INSECURE regarding source E: The list of sources could not be read. ``` --- tasks/init_debian.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tasks/init_debian.yml b/tasks/init_debian.yml index a467419..cfb83a8 100644 --- a/tasks/init_debian.yml +++ b/tasks/init_debian.yml @@ -33,6 +33,13 @@ repo: deb [allow-insecure=true] https://cvmrepo.web.cern.ch/cvmrepo/apt/ {{ ansible_distribution_release }}-prod main when: ansible_distribution == 'Ubuntu' and ansible_distribution_release in ('bionic', 'xenial', 'precise', 'focal') +- name: Remove old CernVM apt repository (legacy format) + ansible.builtin.apt_repository: + filename: cernvm.list + repo: deb [allow-insecure=true] https://cvmrepo.web.cern.ch/cvmrepo/apt/ {{ ansible_distribution_release }}-prod main + state: absent + when: ansible_distribution == 'Ubuntu' and ansible_distribution_release in ('jammy', 'noble') + - name: Configure CernVM apt repository for modern Ubuntu releases ansible.builtin.apt_repository: filename: cernvm