diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2023-08-15 21:55:53 +0200 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2023-08-15 21:55:53 +0200 |
| commit | a47e4ddc43849f36d58a1b48e0f7a71157a82ae1 (patch) | |
| tree | dabae680c0f48b9ff1933375f9782824d949b92d /roles/apt | |
| parent | apt_ppa -> ppa (diff) | |
| download | infra-ansible-a47e4ddc43849f36d58a1b48e0f7a71157a82ae1.tar.gz infra-ansible-a47e4ddc43849f36d58a1b48e0f7a71157a82ae1.zip | |
use ansible_distribution_release as default for APT setup
Diffstat (limited to '')
| -rw-r--r-- | roles/apt_repo/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/apt_repo/tasks/main.yml | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/roles/apt_repo/defaults/main.yml b/roles/apt_repo/defaults/main.yml index 0877adf..6d09a7b 100644 --- a/roles/apt_repo/defaults/main.yml +++ b/roles/apt_repo/defaults/main.yml @@ -1,2 +1 @@ apt_repo_keys_dir: /etc/apt/keyrings -apt_repo_component: main diff --git a/roles/apt_repo/tasks/main.yml b/roles/apt_repo/tasks/main.yml index 25069bb..b9baffd 100644 --- a/roles/apt_repo/tasks/main.yml +++ b/roles/apt_repo/tasks/main.yml @@ -17,7 +17,11 @@ dest: '{{ key_path }}' mode: '644' + - name: Get host distribution + ansible.builtin.setup: + gather_subset: [distribution_release] + - name: 'Add repository: {{ apt_repo_name }}' ansible.builtin.apt_repository: - repo: 'deb [signed-by={{ key_path }}] {{ apt_repo_url }} {{ apt_repo_distro }} {{ apt_repo_component }}' + repo: 'deb [signed-by={{ key_path }}] {{ apt_repo_url }} {{ apt_repo_distro | default(ansible_distribution_release) }} {{ apt_repo_component | default("main") }}' filename: '{{ apt_repo_name }}' |