From 1145bb9cbc59e959f4e15e21fea226402cdfdcae Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Tue, 9 Jun 2026 18:43:11 +0200 Subject: ppa: make include_vars consistent with role "docker" --- roles/ppa/tasks/main.yml | 5 +---- roles/ppa/vars/Debian_10.yml | 1 - roles/ppa/vars/Debian_11.yml | 1 - roles/ppa/vars/Debian_12.yml | 1 - roles/ppa/vars/Debian_13.yml | 1 - roles/ppa/vars/Debian_9.yml | 1 - roles/ppa/vars/Debian_bookworm.yml | 1 + roles/ppa/vars/Debian_bullseye.yml | 1 + roles/ppa/vars/Debian_buster.yml | 1 + roles/ppa/vars/Debian_stretch.yml | 1 + roles/ppa/vars/Debian_trixie.yml | 1 + 11 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 roles/ppa/vars/Debian_10.yml delete mode 100644 roles/ppa/vars/Debian_11.yml delete mode 100644 roles/ppa/vars/Debian_12.yml delete mode 100644 roles/ppa/vars/Debian_13.yml delete mode 100644 roles/ppa/vars/Debian_9.yml create mode 100644 roles/ppa/vars/Debian_bookworm.yml create mode 100644 roles/ppa/vars/Debian_bullseye.yml create mode 100644 roles/ppa/vars/Debian_buster.yml create mode 100644 roles/ppa/vars/Debian_stretch.yml create mode 100644 roles/ppa/vars/Debian_trixie.yml 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_10.yml b/roles/ppa/vars/Debian_10.yml deleted file mode 100644 index 0913769..0000000 --- a/roles/ppa/vars/Debian_10.yml +++ /dev/null @@ -1 +0,0 @@ -ppa_distro: bionic diff --git a/roles/ppa/vars/Debian_11.yml b/roles/ppa/vars/Debian_11.yml deleted file mode 100644 index abd3f09..0000000 --- a/roles/ppa/vars/Debian_11.yml +++ /dev/null @@ -1 +0,0 @@ -ppa_distro: focal diff --git a/roles/ppa/vars/Debian_12.yml b/roles/ppa/vars/Debian_12.yml deleted file mode 100644 index 3960beb..0000000 --- a/roles/ppa/vars/Debian_12.yml +++ /dev/null @@ -1 +0,0 @@ -ppa_distro: jammy diff --git a/roles/ppa/vars/Debian_13.yml b/roles/ppa/vars/Debian_13.yml deleted file mode 100644 index 9aa1b43..0000000 --- a/roles/ppa/vars/Debian_13.yml +++ /dev/null @@ -1 +0,0 @@ -ppa_distro: noble diff --git a/roles/ppa/vars/Debian_9.yml b/roles/ppa/vars/Debian_9.yml deleted file mode 100644 index 983186c..0000000 --- a/roles/ppa/vars/Debian_9.yml +++ /dev/null @@ -1 +0,0 @@ -ppa_distro: xenial diff --git a/roles/ppa/vars/Debian_bookworm.yml b/roles/ppa/vars/Debian_bookworm.yml new file mode 100644 index 0000000..3960beb --- /dev/null +++ b/roles/ppa/vars/Debian_bookworm.yml @@ -0,0 +1 @@ +ppa_distro: jammy diff --git a/roles/ppa/vars/Debian_bullseye.yml b/roles/ppa/vars/Debian_bullseye.yml new file mode 100644 index 0000000..abd3f09 --- /dev/null +++ b/roles/ppa/vars/Debian_bullseye.yml @@ -0,0 +1 @@ +ppa_distro: focal diff --git a/roles/ppa/vars/Debian_buster.yml b/roles/ppa/vars/Debian_buster.yml new file mode 100644 index 0000000..0913769 --- /dev/null +++ b/roles/ppa/vars/Debian_buster.yml @@ -0,0 +1 @@ +ppa_distro: bionic diff --git a/roles/ppa/vars/Debian_stretch.yml b/roles/ppa/vars/Debian_stretch.yml new file mode 100644 index 0000000..983186c --- /dev/null +++ b/roles/ppa/vars/Debian_stretch.yml @@ -0,0 +1 @@ +ppa_distro: xenial diff --git a/roles/ppa/vars/Debian_trixie.yml b/roles/ppa/vars/Debian_trixie.yml new file mode 100644 index 0000000..9aa1b43 --- /dev/null +++ b/roles/ppa/vars/Debian_trixie.yml @@ -0,0 +1 @@ +ppa_distro: noble -- cgit v1.3