From d324a30ff1f6f955a2e6eea4268983a70f5a5628 Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Wed, 24 May 2023 14:43:56 +0200 Subject: [PATCH] DEV-1058 removed ignore_errors - it doesn't make sense (at all) --- group_vars/all/database.yml | 2 ++ group_vars/stage_demompmx/database.yml | 2 -- group_vars/stage_dev/plain.yml | 2 -- group_vars/stage_prodnso/plain.yml | 2 -- group_vars/stage_qa/plain.yml | 2 -- roles/postgres/tasks/master-requirements.yml | 12 ------------ 6 files changed, 2 insertions(+), 20 deletions(-) diff --git a/group_vars/all/database.yml b/group_vars/all/database.yml index 24b1669..25dc924 100644 --- a/group_vars/all/database.yml +++ b/group_vars/all/database.yml @@ -16,3 +16,5 @@ shared_service_pg_slave_ip: "{{ stage_server_infos | list | first | default('-') }}" + +postgres_replicator_user_password: "{{ postgres_replicator_user_password_vault }}" diff --git a/group_vars/stage_demompmx/database.yml b/group_vars/stage_demompmx/database.yml index 201ca79..7639b93 100644 --- a/group_vars/stage_demompmx/database.yml +++ b/group_vars/stage_demompmx/database.yml @@ -19,5 +19,3 @@ stage_postgres_acls: - name: "{{ stage_database_management_gitea_name }}" password: "{{ stage_database_management_gitea_password }}" trusted_cidr_entry: "{{ shared_service_network }}" - -postgres_replicator_user_password: "{{ postgres_replicator_user_password_vault }}" diff --git a/group_vars/stage_dev/plain.yml b/group_vars/stage_dev/plain.yml index 1508dc1..cba340a 100644 --- a/group_vars/stage_dev/plain.yml +++ b/group_vars/stage_dev/plain.yml @@ -33,8 +33,6 @@ harbor_postgresql_password: "{{ harbor_postgresql_password_vault }}" elastic_admin_username: "{{ elastic_admin_username_vault }}" elastic_admin_password: "{{ elastic_admin_password_vault }}" -postgres_replicator_user_password: "{{ postgres_replicator_user_password_vault }}" - gitea_admin_username: "gitea-admin" gitea_admin_password: "{{ gitea_admin_password_vault }}" gitea_realm_admin_username: "gitea-realm-admin" diff --git a/group_vars/stage_prodnso/plain.yml b/group_vars/stage_prodnso/plain.yml index b736a24..e36158f 100644 --- a/group_vars/stage_prodnso/plain.yml +++ b/group_vars/stage_prodnso/plain.yml @@ -32,8 +32,6 @@ harbor_postgresql_password: "{{ harbor_postgresql_password_vault }}" elastic_admin_username: "{{ elastic_admin_username_vault }}" elastic_admin_password: "{{ elastic_admin_password_vault }}" -postgres_replicator_user_password: "{{ postgres_replicator_user_password_vault }}" - gitea_admin_username: "gitea-admin" gitea_admin_password: "{{ gitea_admin_password_vault }}" gitea_realm_admin_username: "gitea-realm-admin" diff --git a/group_vars/stage_qa/plain.yml b/group_vars/stage_qa/plain.yml index 2a48ee3..6d34803 100644 --- a/group_vars/stage_qa/plain.yml +++ b/group_vars/stage_qa/plain.yml @@ -33,8 +33,6 @@ harbor_postgresql_password: "{{ harbor_postgresql_password_vault }}" elastic_admin_username: "{{ elastic_admin_username_vault }}" elastic_admin_password: "{{ elastic_admin_password_vault }}" -postgres_replicator_user_password: "{{ postgres_replicator_user_password_vault }}" - gitea_admin_username: "gitea-admin" gitea_admin_password: "{{ gitea_admin_password_vault }}" gitea_realm_admin_username: "gitea-realm-admin" diff --git a/roles/postgres/tasks/master-requirements.yml b/roles/postgres/tasks/master-requirements.yml index 998557f..a414253 100644 --- a/roles/postgres/tasks/master-requirements.yml +++ b/roles/postgres/tasks/master-requirements.yml @@ -5,20 +5,17 @@ become_user: postgres shell: "/usr/bin/psql -Atc \"SELECT count(rolname) FROM pg_roles where rolname='replicator'\"" # noqa command-instead-of-shell register: role_check - ignore_errors: yes # noqa ignore-errors no-changed-when - name: Create role if necessary become: yes become_user: postgres shell: "/usr/bin/psql -c 'CREATE ROLE replicator WITH REPLICATION LOGIN;'" when: role_check.stdout == "0" - ignore_errors: yes # noqa ignore-errors - name: Change password with scram-sha-256! for replicator and set password become: yes become_user: postgres shell: "/usr/bin/psql -c \"set password_encryption = 'scram-sha-256';ALTER ROLE replicator WITH PASSWORD '{{ postgres_replicator_user_password }}';\"" - ignore_errors: yes # noqa ignore-errors no-changed-when - name: Setup pg_hba.conf for replicator user lineinfile: @@ -111,32 +108,27 @@ become_user: postgres shell: "/usr/bin/psql -Atc \"SELECT count(*) FROM pg_database WHERE datname = 'replication_cron'\"" register: database_replication_check - ignore_errors: yes # noqa ignore-errors no-changed-when - name: Create replication_cron update database become: yes become_user: postgres shell: "/usr/bin/psql -c \"CREATE DATABASE replication_cron;\"" when: database_replication_check.stdout == "0" - ignore_errors: yes # noqa ignore-errors no-changed-when - name: Create replication update schema become: yes become_user: postgres shell: "/usr/bin/psql replication_cron -c \"CREATE SCHEMA IF NOT EXISTS replication_cron;\"" - ignore_errors: yes # noqa ignore-errors no-changed-when - name: Create replication update table become: yes become_user: postgres shell: "/usr/bin/psql replication_cron -c \"CREATE TABLE IF NOT EXISTS replication_cron.replication_cron (dt timestamp);\"" - ignore_errors: yes # noqa ignore-errors no-changed-when - name: Create dummy update data become: yes become_user: postgres shell: "/usr/bin/psql replication_cron -c \"INSERT INTO replication_cron.replication_cron SELECT now() WHERE NOT EXISTS (SELECT 1 from replication_cron.replication_cron);\"" - ignore_errors: yes # noqa ignore-errors no-changed-when - name: Ensure a cron runs every 5 minutes and update replication check table" ansible.builtin.cron: @@ -149,16 +141,13 @@ become_user: postgres shell: "/usr/bin/psql -Atc \"select count(*) from pg_replication_slots where slot_name='pgstandby1'\"" register: replication_slot_check - ignore_errors: yes # noqa ignore-errors no-changed-when - name: Create replication-slot become: yes become_user: postgres shell: "/usr/bin/psql -Atc \"SELECT pg_create_physical_replication_slot('pgstandby1');\"" - ignore_errors: yes # noqa ignore-errors when: replication_slot_check.stdout == "0" - # only needed in case of install from scratch - name: "Ensure test db stuff" block: @@ -185,5 +174,4 @@ name: dummytestdb state: restore target: /tmp/testdb.sql - when: postgres_ensure_testdb | default(False)