From 4a94f84d3e44118d13e38bccfdfeb742e49c03a2 Mon Sep 17 00:00:00 2001 From: Michael Lustenberger Date: Sat, 28 Jun 2025 00:41:48 +0200 Subject: [PATCH] Postgres Packages Move package logic down to the role level. --- install-database-system.yml | 4 ---- roles/install-postgresql/defaults/main.yml | 2 +- roles/install-postgresql/vars/main.yml | 4 +++- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/install-database-system.yml b/install-database-system.yml index dd8d097..27b8fb7 100644 --- a/install-database-system.yml +++ b/install-database-system.yml @@ -10,10 +10,6 @@ - name: Install PostgreSQL Server hosts: app.postgresql.server become: True - vars: - app__postgresql__s_pkg: '{{ os__pkg_name.postgresql[os__short] | d(os__pkg_name.postgresql[os__distro]) }}' - app__postgresql__c_pkg: '{{ os__pkg_name.postgresql_client[os__short] | d(os__pkg_name.postgresql_client[os__distro]) }}' - app__postgresql__yapkg__names: '{{ app__postgresql__s_pkg + app__postgresql__c_pkg }}' roles: - install-postgresql diff --git a/roles/install-postgresql/defaults/main.yml b/roles/install-postgresql/defaults/main.yml index b545437..7e9ff09 100644 --- a/roles/install-postgresql/defaults/main.yml +++ b/roles/install-postgresql/defaults/main.yml @@ -1,4 +1,4 @@ --- -d_yapkg__names: +default__yapkg__names: - postgresql - python-psycopg2 diff --git a/roles/install-postgresql/vars/main.yml b/roles/install-postgresql/vars/main.yml index 7a8982b..10347af 100644 --- a/roles/install-postgresql/vars/main.yml +++ b/roles/install-postgresql/vars/main.yml @@ -1,2 +1,4 @@ --- -postgresql__yapkg__names: '{{ app__postgresql__yapkg__names | d(d_yapkg__names) }}' +postgresql__s_pkg: '{{ os__pkg_name.postgresql[os__short] | d(os__pkg_name.postgresql[os__distro]) }}' +postgresql__c_pkg: '{{ os__pkg_name.postgresql_client[os__short] | d(os__pkg_name.postgresql_client[os__distro]) }}' +postgresql__yapkg__names: '{{ postgresql__s_pkg + postgresql__c_pkg | d(default__yapkg__names) }}'