From db6229997aa350e6dbce2c0fb2a26ff6738478ef Mon Sep 17 00:00:00 2001
From: Thomas Schneider <thomas@fsmpi.rwth-aachen.de>
Date: Mon, 4 May 2020 17:30:18 +0200
Subject: [PATCH] Use ansible_distribution_release for repo config
---
apt/tasks/repositories.yml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/apt/tasks/repositories.yml b/apt/tasks/repositories.yml
index 367fe64..f65bf98 100644
--- a/apt/tasks/repositories.yml
+++ b/apt/tasks/repositories.yml
@@ -5,7 +5,7 @@
- name: enable debian repositories
apt_repository:
state: present
- repo: "deb{{ src }} {{ apt_mirror }} {{ debian_version }}{{ item[1] }} {{ item[0] }}"
+ repo: "deb{{ src }} {{ apt_mirror }} {{ ansible_distribution_release }}{{ item[1] }} {{ item[0] }}"
with_nested:
- "{{ apt_repos }}"
- "{{ apt_sets|union([''])|unique }}"
@@ -18,7 +18,7 @@
- name: disable debian repositories unused sets
apt_repository:
state: absent
- repo: "deb{{ src }} {{ apt_mirror }} {{ debian_version }}{{ item[1] }} {{ item[0] }}"
+ repo: "deb{{ src }} {{ apt_mirror }} {{ ansible_distribution_release }}{{ item[1] }} {{ item[0] }}"
with_nested:
- "{{ apt_repos }}"
- "{{ ['', '-updates', '-backports', '-proposed-updates']|difference(apt_sets|union([''])) }}"
@@ -31,7 +31,7 @@
- name: disable debian repositories unused repos
apt_repository:
state: absent
- repo: "deb{{ src }} {{ apt_mirror }} {{ debian_version }}{{ item[1] }} {{ item[0] }}"
+ repo: "deb{{ src }} {{ apt_mirror }} {{ ansible_distribution_release }}{{ item[1] }} {{ item[0] }}"
with_nested:
- "{{ ['main', 'contrib', 'non-free']|difference(apt_repos) }}"
- ['', '-updates', '-backports', '-proposed-updates']
@@ -44,7 +44,7 @@
- name: enable debian security repositories
apt_repository:
state: present
- repo: "deb{{ src }} {{ apt_mirror_security }} {{ debian_version }}{{ item[1] }} {{ item[0] }}"
+ repo: "deb{{ src }} {{ apt_mirror_security }} {{ ansible_distribution_release }}{{ item[1] }} {{ item[0] }}"
with_nested:
- "{{ apt_repos }}"
- ['/updates']
@@ -58,7 +58,7 @@
- name: disable debian security repositories unused repos
apt_repository:
state: absent
- repo: "deb{{ src }} {{ apt_mirror_security }} {{ debian_version }}{{ item[1] }} {{ item[0] }}"
+ repo: "deb{{ src }} {{ apt_mirror_security }} {{ ansible_distribution_release }}{{ item[1] }} {{ item[0] }}"
with_nested:
- "{{ ['main', 'contrib', 'non-free']|difference(apt_repos) }}"
- ['/updates']
--
GitLab