From cf2bc2097e3a251f6918c9b7b49b8513158f19e3 Mon Sep 17 00:00:00 2001 From: rene Date: Tue, 15 Mar 2022 20:20:56 +0100 Subject: [PATCH] changed vars --- os_vars/debian.yml | 4 ++-- os_vars/ubuntu.yml | 4 ++-- roles/database/tasks/install_postgres.yml | 2 +- roles/database/tasks/install_redis.yml | 2 +- roles/database/tasks/main.yml | 3 ++- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/os_vars/debian.yml b/os_vars/debian.yml index fc36047..baad885 100644 --- a/os_vars/debian.yml +++ b/os_vars/debian.yml @@ -1,11 +1,11 @@ snmp-user: Debian-snmp -redis: +redis_pkgs: packages: - package: "redis-server" - package: "redis-tools" -postgres: +postgres_pkgs: packages: - package: "libpq-dev" - package: "postgresql" diff --git a/os_vars/ubuntu.yml b/os_vars/ubuntu.yml index fc36047..baad885 100644 --- a/os_vars/ubuntu.yml +++ b/os_vars/ubuntu.yml @@ -1,11 +1,11 @@ snmp-user: Debian-snmp -redis: +redis_pkgs: packages: - package: "redis-server" - package: "redis-tools" -postgres: +postgres_pkgs: packages: - package: "libpq-dev" - package: "postgresql" diff --git a/roles/database/tasks/install_postgres.yml b/roles/database/tasks/install_postgres.yml index 89caede..0d82df0 100644 --- a/roles/database/tasks/install_postgres.yml +++ b/roles/database/tasks/install_postgres.yml @@ -6,4 +6,4 @@ state: latest install_recommends: no become: yes - with_items: "{{ postgres.packages }}" \ No newline at end of file + with_items: "{{ postgres_pkgs.packages }}" \ No newline at end of file diff --git a/roles/database/tasks/install_redis.yml b/roles/database/tasks/install_redis.yml index eba148a..cd27d50 100644 --- a/roles/database/tasks/install_redis.yml +++ b/roles/database/tasks/install_redis.yml @@ -6,4 +6,4 @@ state: latest install_recommends: no become: yes - with_items: "{{ redis.packages }}" \ No newline at end of file + with_items: "{{ redis_pkgs.packages }}" \ No newline at end of file diff --git a/roles/database/tasks/main.yml b/roles/database/tasks/main.yml index 2976423..0b6d41c 100644 --- a/roles/database/tasks/main.yml +++ b/roles/database/tasks/main.yml @@ -1,6 +1,7 @@ # Load distro-specific variables -- include_vars: "{{ ansible_distribution }}.yml" +- include_vars: "{{ ansible_distribution|lower }}.yml" tags: always + ignore_errors: True - block: - debug: