From b28b8f13c933371cbdde6820aad9aa9d320ce0b7 Mon Sep 17 00:00:00 2001 From: MOHANKUMAR T Date: Tue, 24 Jan 2023 12:09:37 +0530 Subject: [PATCH 1/2] BAH-1527 | Fix. Update postgres installation to install from local RPMs --- roles/postgres/defaults/main.yml | 12 ++++++++---- roles/postgres/tasks/main.yml | 23 +++++++++-------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/roles/postgres/defaults/main.yml b/roles/postgres/defaults/main.yml index f467b1a..13acc24 100644 --- a/roles/postgres/defaults/main.yml +++ b/roles/postgres/defaults/main.yml @@ -1,5 +1,9 @@ download_folder: /opt -postgres_repo_rpm_name: pgdg-redhat-repo-42.0-23.noarch.rpm -postgres_repo_rpm_mirror: https://yum.postgresql.org/common/redhat/rhel-7-x86_64 -postgres_repo_download_url: "{{postgres_repo_rpm_mirror}}/{{postgres_repo_rpm_name}}" -postgres_repo_rpm_location: "{{download_folder}}/{{ postgres_repo_rpm_name}}" +postgres_rpm_name: postgresql96-9.6.24-1PGDG.rhel7.x86_64.rpm +postgres_server_rpm_name: postgresql96-server-9.6.24-1PGDG.rhel7.x86_64.rpm +postgres_libs_rpm_name: postgresql96-libs-9.6.24-1PGDG.rhel7.x86_64.rpm +postgres_contrib_rpm_name: postgresql96-contrib-9.6.24-1PGDG.rhel7.x86_64.rpm +postgres_rpm_location: "{{download_folder}}/{{postgres_rpm_name}}" +postgres_server_rpm_location: "{{download_folder}}/{{postgres_server_rpm_name}}" +postgres_libs_rpm_location: "{{download_folder}}/{{postgres_libs_rpm_name}}" +postgres_contrib_rpm_location: "{{download_folder}}/{{postgres_contrib_rpm_name}}" diff --git a/roles/postgres/tasks/main.yml b/roles/postgres/tasks/main.yml index 42b4d53..6b91d89 100644 --- a/roles/postgres/tasks/main.yml +++ b/roles/postgres/tasks/main.yml @@ -1,22 +1,17 @@ -- name: Check if postgres yum repo rpm is present - stat: path={{postgres_repo_rpm_location}} - register: postgresRepoRpm - -- name: Download postgres yum repo rpm if not present - command: "wget -q -O {{ postgres_repo_rpm_location }} {{postgres_repo_download_url}} creates={{ postgres_repo_rpm_location }}" - when: postgresRepoRpm.stat.exists == false - -- name: Install postgresql yum repository - yum: name={{postgres_repo_rpm_location}} state=present - - name: Install python-psycopg2 command: yum -y install python-psycopg2 -- name: Install postgresql - yum: name="postgresql{{postgres_bin_version}}-server" state=present +- name: Install postgresql libs + yum: name={{postgres_libs_rpm_location}} state=present + +- name: Install postgres + yum: name={{postgres_rpm_location}} state=present + +- name: Install postgresql server + yum: name={{postgres_server_rpm_location}} state=present - name: Install postgresql-contrib - yum: name="postgresql{{postgres_bin_version}}-contrib" state=present + yum: name={{postgres_contrib_rpm_location}} state=present - name: Initiate database command: /usr/pgsql-{{postgres_version}}/bin/postgresql{{postgres_bin_version}}-setup initdb creates=/var/lib/pgsql/{{postgres_version}}/data/postgresql.conf From 2103af835ac9daf2f7aeba46054f1204fc03aad5 Mon Sep 17 00:00:00 2001 From: MOHANKUMAR T Date: Tue, 24 Jan 2023 12:10:24 +0530 Subject: [PATCH 2/2] BAH-1527 | Fix. Remove postgres repo check from individual services --- roles/bahmni-erp/tasks/main.yml | 11 ----------- roles/bahmni-lab/tasks/main.yml | 11 ----------- roles/bahmni-odoo/tasks/main.yml | 12 ------------ roles/pacs-integration/tasks/main.yml | 11 ----------- 4 files changed, 45 deletions(-) diff --git a/roles/bahmni-erp/tasks/main.yml b/roles/bahmni-erp/tasks/main.yml index c3cb2af..569c1be 100644 --- a/roles/bahmni-erp/tasks/main.yml +++ b/roles/bahmni-erp/tasks/main.yml @@ -9,17 +9,6 @@ - name: install nonblockingloghandler pip: name=nonblockingloghandler state=present -- name: Check if postgres yum repo rpm is present - stat: path={{postgres_repo_rpm_location}} - register: postgresRepoRpm - -- name: Download postgres yum repo rpm if not present - command: "wget -q -O {{ postgres_repo_rpm_location }} {{postgres_repo_download_url}} creates={{ postgres_repo_rpm_location }}" - when: postgresRepoRpm.stat.exists == false - -- name: Install postgresql yum repository - yum: name={{postgres_repo_rpm_location}} state=present - - name: Install python-psycopg2 yum: name=python-psycopg2 state=present diff --git a/roles/bahmni-lab/tasks/main.yml b/roles/bahmni-lab/tasks/main.yml index 9954e8c..2aa381e 100644 --- a/roles/bahmni-lab/tasks/main.yml +++ b/roles/bahmni-lab/tasks/main.yml @@ -1,14 +1,3 @@ -- name: Check if postgres yum repo rpm is present - stat: path={{postgres_repo_rpm_location}} - register: postgresRepoRpm - -- name: Download postgres yum repo rpm if not present - command: "wget -q -O {{ postgres_repo_rpm_location }} {{postgres_repo_download_url}} creates={{ postgres_repo_rpm_location }}" - when: postgresRepoRpm.stat.exists == false - -- name: Install postgresql yum repository - yum: name={{postgres_repo_rpm_location}} state=present - - name: Check if bahmni-lab rpm needs an update command: yum list installed bahmni-lab register: installed_bahmni_lab diff --git a/roles/bahmni-odoo/tasks/main.yml b/roles/bahmni-odoo/tasks/main.yml index 0adb5ac..0f2e8fd 100644 --- a/roles/bahmni-odoo/tasks/main.yml +++ b/roles/bahmni-odoo/tasks/main.yml @@ -1,15 +1,3 @@ - -- name: Check if postgres yum repo rpm is present - stat: path={{postgres_repo_rpm_location}} - register: postgresRepoRpm - -- name: Download postgres yum repo rpm if not present - command: "wget -q -O {{ postgres_repo_rpm_location }} {{postgres_repo_download_url}} creates={{ postgres_repo_rpm_location }}" - when: postgresRepoRpm.stat.exists == false - -- name: Install postgresql yum repository - yum: name={{postgres_repo_rpm_location}} state=present - - name: Install curl become: yes yum: name=curl state=present diff --git a/roles/pacs-integration/tasks/main.yml b/roles/pacs-integration/tasks/main.yml index e0842e0..3302099 100644 --- a/roles/pacs-integration/tasks/main.yml +++ b/roles/pacs-integration/tasks/main.yml @@ -1,14 +1,3 @@ -- name: Check if postgres yum repo rpm is present - stat: path={{postgres_repo_rpm_location}} - register: postgresRepoRpm - -- name: Download postgres yum repo rpm if not present - command: "wget -q -O {{ postgres_repo_rpm_location }} {{postgres_repo_download_url}} creates={{ postgres_repo_rpm_location }}" - when: postgresRepoRpm.stat.exists == false - -- name: Install postgresql yum repository - yum: name={{postgres_repo_rpm_location}} state=present - - name: Check if pacs-integration rpm needs an update command: yum list installed pacs-integration register: installed_pacs_integration