Skip to content

Commit 94c1e0c

Browse files
authored
Merge pull request #81 from mvdbeek/fix_boolean
Fix boolean & installation on modern ubuntu
2 parents 4300825 + f1dd05b commit 94c1e0c

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

defaults/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ cvmfs_config_repo: {}
106106
# CVMFS_CONFIG_REPOSITORY is not supported on Debian < 9, Ubuntu LTS < 18.04
107107
cvmfs_config_repo_supported: >-
108108
{{
109-
'true' if ansible_os_family != 'Debian' else (
110-
'true' if (ansible_distribution == 'Debian' and ansible_distribution_version is version('9', '>=')) else (
111-
'true' if (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('18.04', '>=')) else
112-
'false'))
109+
true if ansible_os_family != 'Debian' else (
110+
true if (ansible_distribution == 'Debian' and ansible_distribution_version is version('9', '>=')) else (
111+
true if (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('18.04', '>=')) else
112+
false))
113113
}}
114114
115115
# When to update the GeoIP database, if cvmfs_geo_license_key is defined

tasks/init_debian.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@
3333
repo: deb [allow-insecure=true] https://cvmrepo.web.cern.ch/cvmrepo/apt/ {{ ansible_distribution_release }}-prod main
3434
when: ansible_distribution == 'Ubuntu' and ansible_distribution_release in ('bionic', 'xenial', 'precise', 'focal')
3535

36+
- name: Remove old CernVM apt repository (legacy format)
37+
ansible.builtin.apt_repository:
38+
filename: cernvm.list
39+
repo: deb [allow-insecure=true] https://cvmrepo.web.cern.ch/cvmrepo/apt/ {{ ansible_distribution_release }}-prod main
40+
state: absent
41+
when: ansible_distribution == 'Ubuntu' and ansible_distribution_release in ('jammy', 'noble')
42+
3643
- name: Configure CernVM apt repository for modern Ubuntu releases
3744
ansible.builtin.apt_repository:
3845
filename: cernvm

0 commit comments

Comments
 (0)