Skip to content
This repository was archived by the owner on Jun 2, 2024. It is now read-only.

Commit 72c3381

Browse files
committed
Override only when needed
1 parent ae8ec44 commit 72c3381

File tree

2 files changed

+20
-16
lines changed

2 files changed

+20
-16
lines changed

ansible/roles/bpp-site/tasks/main.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
- include_vars: ../../postgresql-server/defaults/main.yml
1+
- include_vars:
2+
file: ../../postgresql-server/defaults/main.yml
3+
name: psql_defaults
24

35
- name: Update apt cache
46
apt: update_cache=yes
57

6-
- name: Install apt packages and PostgreSQL version {{ postgresql_version }}
8+
- name: Install apt packages and PostgreSQL version {{ postgresql_version|default(psql_defaults.postgresql_version) }}
79
ansible.builtin.apt:
810
pkg:
911
- build-essential
1012
- python3-psycopg2
1113
- postgresql-common
12-
- postgresql-client-{{ postgresql_version }}
14+
- postgresql-client-{{ postgresql_version|default(psql_defaults.postgresql_version) }}
1315
- libpq-dev
1416
- acl
1517

ansible/roles/bpp-site/tasks/postgresql.yml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
---
2-
- include_vars: ../../postgresql-server/defaults/main.yml
2+
- include_vars:
3+
file: ../../postgresql-server/defaults/main.yml
4+
name: psql_defaults
35

46
- name: Create PostgreSQL user
57
postgresql_user:
@@ -8,19 +10,19 @@
810
role_attr_flags=CREATEDB,SUPERUSER
911
state=present
1012

11-
login_user={{ postgresql_user }}
12-
login_host={{ postgresql_host }}
13-
login_password="{{ postgresql_password }}"
14-
login_port={{ postgresql_port }}
13+
login_user={{ postgresql_user|default(psql_defaults.postgresql_user) }}
14+
login_host={{ postgresql_host|default(psql_defaults.postgresql_host) }}
15+
login_password="{{ postgresql_password|default(psql_defaults.postgresql_password) }}"
16+
login_port={{ postgresql_port|default(psql_defaults.postgresql_port) }}
1517

1618
- name: CreatePostgreSQL database
1719
postgresql_db:
1820
name={{ database_name }}
1921

20-
login_host={{ postgresql_host }}
22+
login_host={{ postgresql_host|default(psql_defaults.postgresql_host) }}
2123
login_user={{ database_user }}
2224
login_password="{{ lookup('password', 'credentials/' + inventory_hostname + '/' + database_user + '/' + '/database_password length=25') }}"
23-
login_port="{{ postgresql_port }}"
25+
login_port={{ postgresql_port|default(psql_defaults.postgresql_port) }}
2426

2527
args:
2628
owner: "{{ database_user }}"
@@ -36,20 +38,20 @@
3638
lang=plpython3u
3739
state=present
3840

39-
login_host={{ postgresql_host }}
41+
login_host={{ postgresql_host|default(psql_defaults.postgresql_host) }}
4042
login_user={{ database_user }}
4143
login_password="{{ lookup('password', 'credentials/' + inventory_hostname + '/' + database_user + '/' + '/database_password length=25') }}"
42-
login_port={{ postgresql_port }}
44+
login_port={{ postgresql_port|default(psql_defaults.postgresql_port) }}
4345

4446
- name: Create PostgreSQL collation for pl_PL
4547
postgresql_query:
4648
db: "{{database_name}}"
4749
query: CREATE COLLATION pl_PL(locale='pl_PL.utf8');
4850

49-
login_host: "{{ postgresql_host }}"
51+
login_host: "{{ postgresql_host|default(psql_defaults.postgresql_host) }}"
5052
login_user: "{{ database_user }}"
5153
login_password: "{{ lookup('password', 'credentials/' + inventory_hostname + '/' + database_user + '/' + '/database_password length=25') }}"
52-
login_port: "{{ postgresql_port }}"
54+
login_port: "{{ postgresql_port|default(psql_defaults.postgresql_port) }}"
5355
ignore_errors: yes
5456
register: psql_coll_err
5557

@@ -62,10 +64,10 @@
6264
db: "{{database_name}}"
6365
query: CREATE COLLATION pl_PL(locale='pl_PL.utf8');
6466

65-
login_host: "{{ postgresql_host }}"
67+
login_host: "{{ postgresql_host|default(psql_defaults.postgresql_host) }}"
6668
login_user: "{{ database_user }}"
6769
login_password: "{{ lookup('password', 'credentials/' + inventory_hostname + '/' + database_user + '/' + '/database_password length=25') }}"
68-
login_port: "{{ postgresql_port }}"
70+
login_port: "{{ postgresql_port|default(psql_defaults.postgresql_port) }}"
6971
ignore_errors: yes
7072
register: psql_coll_err_2
7173

0 commit comments

Comments
 (0)