Prefix database task-files with initialize

It reflects more accurately what we're trying to achieve. Also strip out zabbix_proxy_db_long, it serves no purpose anymore.
ansible-collections · May 6, 2024 · f159c83 · f159c83
1 parent a12db7f
commit f159c83
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 3 deletions.
diff --git a/roles/zabbix_proxy/tasks/mysql.yml → ...s/zabbix_proxy/tasks/initialize-mysql.yml b/roles/zabbix_proxy/tasks/mysql.yml → ...s/zabbix_proxy/tasks/initialize-mysql.yml
diff --git a/roles/zabbix_proxy/tasks/postgresql.yml → ...s/zabbix_proxy/tasks/initialize-pgsql.yml b/roles/zabbix_proxy/tasks/postgresql.yml → ...s/zabbix_proxy/tasks/initialize-pgsql.yml
diff --git a/roles/zabbix_proxy/tasks/sqlite3.yml → ...zabbix_proxy/tasks/initialize-sqlite3.yml b/roles/zabbix_proxy/tasks/sqlite3.yml → ...zabbix_proxy/tasks/initialize-sqlite3.yml
diff --git a/roles/zabbix_proxy/tasks/main.yml b/roles/zabbix_proxy/tasks/main.yml
@@ -14,7 +14,6 @@
 
 - name: Set More Variables
   ansible.builtin.set_fact:
-    zabbix_proxy_db_long: "{{ 'postgresql' if zabbix_proxy_database == 'pgsql' else zabbix_proxy_database }}"
     zabbix_short_version: "{{ zabbix_proxy_version | regex_replace('\\.', '') }}"
     zabbix_proxy_fpinglocation: "{{ zabbix_proxy_fpinglocation if zabbix_proxy_fpinglocation is defined else _zabbix_proxy_fpinglocation}}"
     zabbix_proxy_fping6location: "{{ zabbix_proxy_fping6location if zabbix_proxy_fping6location is defined else _zabbix_proxy_fping6location}}"
@@ -79,8 +78,8 @@
   tags:
     - database
 
-- name: "Installing the database"
-  ansible.builtin.include_tasks: "{{ zabbix_proxy_db_long }}.yml"
+- name: "Initialize the database"
+  ansible.builtin.include_tasks: "initialize-{{ zabbix_proxy_database }}.yml"
 
 - name: "Create include dir zabbix-proxy"
   ansible.builtin.file: