Refactor when: mariadb_use_official_repo in a block

This commit is contained in:
jo 2022-10-14 12:47:20 +02:00
parent f033b79f75
commit d09bc65a6d
1 changed files with 41 additions and 42 deletions

View File

@ -1,14 +1,16 @@
---
- name: Install mariadb repo necessary packages
- name: Install mariadb official repository
when: mariadb_use_official_repo
block:
- name: Install mariadb repo necessary packages
ansible.builtin.apt:
package:
- apt-transport-https
- gnupg2
state: present
update_cache: true
when: mariadb_use_official_repo
- name: Install mariadb repository key
- name: Install mariadb repository key
ansible.builtin.get_url:
url: "https://mariadb.org/mariadb_release_signing_key.asc"
dest: "/etc/apt/trusted.gpg.d/mariadb.asc"
@ -17,13 +19,12 @@
owner: root
group: root
mode: "0644"
when: mariadb_use_official_repo
- name: Determine distribution name (Debian sid pb)
- name: Determine distribution name (Debian sid pb)
ansible.builtin.set_fact:
distribution: "{% if 'n/a' in ansible_distribution_release %}sid{% else %}{{ ansible_distribution_release }}{% endif %}"
- name: Setup mariadb repository sourcelist entry
- name: Setup mariadb repository sourcelist entry
ansible.builtin.copy:
dest: /etc/apt/sources.list.d/mariadb.list
content: |
@ -32,9 +33,8 @@
owner: root
group: root
mode: "0644"
when: mariadb_use_official_repo
- name: Prefer MariaDB repo over Debian repo
- name: Prefer MariaDB repo over Debian repo
ansible.builtin.copy:
dest: /etc/apt/preferences.d/release
content: |
@ -45,7 +45,6 @@
owner: root
group: root
mode: "0644"
when: mariadb_use_official_repo
- name: Install packages
ansible.builtin.apt: