From 117bbd92012ed115018ef80bc69ba59b0be4309e Mon Sep 17 00:00:00 2001 From: Patryk Konopka Date: Thu, 22 Aug 2024 14:55:43 +0200 Subject: [PATCH 1/2] PMM-13314 Add flag to control adding yum repo in initialization --- .../ansible/playbook/tasks/roles/postgres/tasks/main.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/update/ansible/playbook/tasks/roles/postgres/tasks/main.yml b/update/ansible/playbook/tasks/roles/postgres/tasks/main.yml index e70c17ca80..e99306c9ea 100644 --- a/update/ansible/playbook/tasks/roles/postgres/tasks/main.yml +++ b/update/ansible/playbook/tasks/roles/postgres/tasks/main.yml @@ -10,6 +10,8 @@ gpgcheck: yes enabled: yes gpgkey: file:///etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY + when: + - lookup('env', 'DISABLE_REMOTE_YUM_REPOSITORY', default='undefined') == 'undefined' - name: Add PostgreSQL 11 YUM repository for EL7 yum_repository: @@ -19,6 +21,8 @@ gpgcheck: yes enabled: yes gpgkey: file:///etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY + when: + - lookup('env', 'DISABLE_REMOTE_YUM_REPOSITORY', default='undefined') == 'undefined' # we need the old postgres binary for the upgrade process - name: Install Postgres @@ -48,6 +52,8 @@ gpgcheck: yes enabled: yes gpgkey: file:///etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY + when: + - lookup('env', 'DISABLE_REMOTE_YUM_REPOSITORY', default='undefined') == 'undefined' - name: Add PostgreSQL 11 YUM repository for EL9 yum_repository: @@ -57,6 +63,8 @@ gpgcheck: yes enabled: yes gpgkey: file:///etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY + when: + - lookup('env', 'DISABLE_REMOTE_YUM_REPOSITORY', default='undefined') == 'undefined' # we need the old postgres binary for the upgrade process - name: Install Postgres From dca58ba8467989fb3394d0eaddf5295f9df91489 Mon Sep 17 00:00:00 2001 From: Patryk Konopka Date: Fri, 30 Aug 2024 09:02:05 +0200 Subject: [PATCH 2/2] Replace undefined with false --- .../ansible/playbook/tasks/roles/postgres/tasks/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/update/ansible/playbook/tasks/roles/postgres/tasks/main.yml b/update/ansible/playbook/tasks/roles/postgres/tasks/main.yml index e99306c9ea..ac3a20d1fd 100644 --- a/update/ansible/playbook/tasks/roles/postgres/tasks/main.yml +++ b/update/ansible/playbook/tasks/roles/postgres/tasks/main.yml @@ -11,7 +11,7 @@ enabled: yes gpgkey: file:///etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY when: - - lookup('env', 'DISABLE_REMOTE_YUM_REPOSITORY', default='undefined') == 'undefined' + - lookup('env', 'DISABLE_REMOTE_YUM_REPOSITORY', default='false') == 'false' - name: Add PostgreSQL 11 YUM repository for EL7 yum_repository: @@ -22,7 +22,7 @@ enabled: yes gpgkey: file:///etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY when: - - lookup('env', 'DISABLE_REMOTE_YUM_REPOSITORY', default='undefined') == 'undefined' + - lookup('env', 'DISABLE_REMOTE_YUM_REPOSITORY', default='false') == 'false' # we need the old postgres binary for the upgrade process - name: Install Postgres @@ -53,7 +53,7 @@ enabled: yes gpgkey: file:///etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY when: - - lookup('env', 'DISABLE_REMOTE_YUM_REPOSITORY', default='undefined') == 'undefined' + - lookup('env', 'DISABLE_REMOTE_YUM_REPOSITORY', default='false') == 'false' - name: Add PostgreSQL 11 YUM repository for EL9 yum_repository: @@ -64,7 +64,7 @@ enabled: yes gpgkey: file:///etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY when: - - lookup('env', 'DISABLE_REMOTE_YUM_REPOSITORY', default='undefined') == 'undefined' + - lookup('env', 'DISABLE_REMOTE_YUM_REPOSITORY', default='false') == 'false' # we need the old postgres binary for the upgrade process - name: Install Postgres