diff options
| author | Egor Tensin <egor@tensin.name> | 2026-06-09 18:43:11 +0200 |
|---|---|---|
| committer | Egor Tensin <egor@tensin.name> | 2026-06-09 18:43:11 +0200 |
| commit | 1145bb9cbc59e959f4e15e21fea226402cdfdcae (patch) | |
| tree | 44365b733bb4ac23fbf2423ed08cd3e271506dbc | |
| parent | docker: fix required package lists (diff) | |
| download | infra-ansible-1145bb9cbc59e959f4e15e21fea226402cdfdcae.tar.gz infra-ansible-1145bb9cbc59e959f4e15e21fea226402cdfdcae.zip | |
ppa: make include_vars consistent with role "docker"
| -rw-r--r-- | roles/ppa/tasks/main.yml | 5 | ||||
| -rw-r--r-- | roles/ppa/vars/Debian_bookworm.yml (renamed from roles/ppa/vars/Debian_12.yml) | 0 | ||||
| -rw-r--r-- | roles/ppa/vars/Debian_bullseye.yml (renamed from roles/ppa/vars/Debian_11.yml) | 0 | ||||
| -rw-r--r-- | roles/ppa/vars/Debian_buster.yml (renamed from roles/ppa/vars/Debian_10.yml) | 0 | ||||
| -rw-r--r-- | roles/ppa/vars/Debian_stretch.yml (renamed from roles/ppa/vars/Debian_9.yml) | 0 | ||||
| -rw-r--r-- | roles/ppa/vars/Debian_trixie.yml (renamed from roles/ppa/vars/Debian_13.yml) | 0 |
6 files changed, 1 insertions, 4 deletions
diff --git a/roles/ppa/tasks/main.yml b/roles/ppa/tasks/main.yml index fbe12c0..002d0f1 100644 --- a/roles/ppa/tasks/main.yml +++ b/roles/ppa/tasks/main.yml @@ -2,16 +2,13 @@ ansible.builtin.setup: gather_subset: - distribution - - distribution_major_version - distribution_release - - os_family - name: Set platform-specific variables ansible.builtin.include_vars: "{{ __ppa_vars_file }}" loop: - - "{{ ansible_facts['os_family'] }}.yml" - "{{ ansible_facts['distribution'] }}.yml" - - "{{ ansible_facts['distribution'] }}_{{ ansible_facts['distribution_major_version'] }}.yml" + - "{{ ansible_facts['distribution'] }}_{{ ansible_facts['distribution_release'] }}.yml" vars: __ppa_vars_file: "{{ role_path }}/vars/{{ item }}" when: __ppa_vars_file is exists diff --git a/roles/ppa/vars/Debian_12.yml b/roles/ppa/vars/Debian_bookworm.yml index 3960beb..3960beb 100644 --- a/roles/ppa/vars/Debian_12.yml +++ b/roles/ppa/vars/Debian_bookworm.yml diff --git a/roles/ppa/vars/Debian_11.yml b/roles/ppa/vars/Debian_bullseye.yml index abd3f09..abd3f09 100644 --- a/roles/ppa/vars/Debian_11.yml +++ b/roles/ppa/vars/Debian_bullseye.yml diff --git a/roles/ppa/vars/Debian_10.yml b/roles/ppa/vars/Debian_buster.yml index 0913769..0913769 100644 --- a/roles/ppa/vars/Debian_10.yml +++ b/roles/ppa/vars/Debian_buster.yml diff --git a/roles/ppa/vars/Debian_9.yml b/roles/ppa/vars/Debian_stretch.yml index 983186c..983186c 100644 --- a/roles/ppa/vars/Debian_9.yml +++ b/roles/ppa/vars/Debian_stretch.yml diff --git a/roles/ppa/vars/Debian_13.yml b/roles/ppa/vars/Debian_trixie.yml index 9aa1b43..9aa1b43 100644 --- a/roles/ppa/vars/Debian_13.yml +++ b/roles/ppa/vars/Debian_trixie.yml |