From 0f7a6efc2b55086c20c09e24fa77167b3fc81392 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Tue, 26 May 2020 14:08:00 +0200 Subject: [PATCH] pagure and distgit/pagure: Drop the db-pagure hostname and populate the db used in the inventor host file instead Basically, instead of relying on an obscure db-pagure variable that then needs to be specified in the /etc/hosts file. Just define the pagure_db_host variable in the host's inventory file so it exists as a variable available in the playbook/role. This makes things more explicit and easier to debug/tweak as needed. Signed-off-by: Pierre-Yves Chibon --- inventory/host_vars/pagure-stg01.fedoraproject.org | 3 +++ inventory/host_vars/pagure01.fedoraproject.org | 3 +++ inventory/host_vars/pkgs01.iad2.fedoraproject.org | 3 +++ inventory/host_vars/pkgs01.stg.phx2.fedoraproject.org | 3 +++ inventory/host_vars/pkgs02.phx2.fedoraproject.org | 3 +++ roles/distgit/pagure/templates/pagure.cfg | 2 +- roles/distgit/pagure/templates/pagure_hook.cfg | 2 +- roles/hosts/files/pagure-stg01.fedoraproject.org-hosts | 3 --- roles/hosts/files/pagure01.fedoraproject.org-hosts | 1 - roles/hosts/files/pkgs01.stg.phx2.fedoraproject.org-hosts | 1 - roles/hosts/files/pkgs02.phx2.fedoraproject.org-hosts | 1 - 11 files changed, 17 insertions(+), 8 deletions(-) delete mode 100644 roles/hosts/files/pagure-stg01.fedoraproject.org-hosts diff --git a/inventory/host_vars/pagure-stg01.fedoraproject.org b/inventory/host_vars/pagure-stg01.fedoraproject.org index 827ab48f45..1cbba9d33b 100644 --- a/inventory/host_vars/pagure-stg01.fedoraproject.org +++ b/inventory/host_vars/pagure-stg01.fedoraproject.org @@ -27,3 +27,6 @@ effective_cache_size: "6GB" ssh_hostnames: - stg.pagure.io + +# DB host: +pagure_db_host: 127.0.0.1 diff --git a/inventory/host_vars/pagure01.fedoraproject.org b/inventory/host_vars/pagure01.fedoraproject.org index 8728ddb16b..b94b6e8932 100644 --- a/inventory/host_vars/pagure01.fedoraproject.org +++ b/inventory/host_vars/pagure01.fedoraproject.org @@ -33,3 +33,6 @@ ssh_hostnames: sar_script: /usr/local/bin/pagure_sar.py sar_script_user: git sar_output_file: pagure.json + +# DB used: +pagure_db_host: 127.0.0.1 diff --git a/inventory/host_vars/pkgs01.iad2.fedoraproject.org b/inventory/host_vars/pkgs01.iad2.fedoraproject.org index d96aeada24..91ebbba9fa 100644 --- a/inventory/host_vars/pkgs01.iad2.fedoraproject.org +++ b/inventory/host_vars/pkgs01.iad2.fedoraproject.org @@ -29,3 +29,6 @@ sar_script: /usr/local/bin/pagure_sar.py sar_script_user: root sar_output_file: dist_git.json +# DB used by pagure +pagure_db_host: db01.iad2.fedoraproject.org + diff --git a/inventory/host_vars/pkgs01.stg.phx2.fedoraproject.org b/inventory/host_vars/pkgs01.stg.phx2.fedoraproject.org index 0851c8453c..4e70c0146f 100644 --- a/inventory/host_vars/pkgs01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/pkgs01.stg.phx2.fedoraproject.org @@ -18,3 +18,6 @@ virt_install_command: "{{ virt_install_command_two_nic }}" # temp fix to get htis box working baseiptables: False + +# DB used by pagure +pagure_db_host: db01.stg.phx2.fedoraproject.org diff --git a/inventory/host_vars/pkgs02.phx2.fedoraproject.org b/inventory/host_vars/pkgs02.phx2.fedoraproject.org index 0061d406d9..e5b2006c47 100644 --- a/inventory/host_vars/pkgs02.phx2.fedoraproject.org +++ b/inventory/host_vars/pkgs02.phx2.fedoraproject.org @@ -33,3 +33,6 @@ sar_script: /usr/local/bin/pagure_sar.py sar_script_user: root sar_output_file: dist_git.json +# DB used by pagure +pagure_db_host: db01.phx2.fedoraproject.org + diff --git a/roles/distgit/pagure/templates/pagure.cfg b/roles/distgit/pagure/templates/pagure.cfg index 79b8bc4163..7d306fbe74 100644 --- a/roles/distgit/pagure/templates/pagure.cfg +++ b/roles/distgit/pagure/templates/pagure.cfg @@ -26,7 +26,7 @@ PREFERRED_URL_SCHEME='https' ### url to the database server: #DB_URL=mysql://user:pass@host/db_name #DB_URL=postgres://user:pass@host/db_name -DB_URL = 'postgresql://{{ distgit_pagure_db_user }}:{{ distgit_pagure_db_pass }}@{{ distgit_pagure_db_host }}/{{ distgit_pagure_db_name }}' +DB_URL = 'postgresql://{{ distgit_pagure_db_user }}:{{ distgit_pagure_db_pass }}@{{ pagure_db_host }}/{{ distgit_pagure_db_name }}' ### FAS groups of pagure admins ADMIN_GROUP = ['cvsadmin', 'sysadmin-main'] diff --git a/roles/distgit/pagure/templates/pagure_hook.cfg b/roles/distgit/pagure/templates/pagure_hook.cfg index 74ce643049..ac87a1ed93 100644 --- a/roles/distgit/pagure/templates/pagure_hook.cfg +++ b/roles/distgit/pagure/templates/pagure_hook.cfg @@ -3,7 +3,7 @@ import os os.umask(0o002) -DB_URL = 'postgresql://{{ distgit_pagure_db_ro_user }}:{{ distgit_pagure_db_ro_pass }}@{{ distgit_pagure_db_host }}/{{ distgit_pagure_db_name }}' +DB_URL = 'postgresql://{{ distgit_pagure_db_ro_user }}:{{ distgit_pagure_db_ro_pass }}@{{ pagure_db_host }}/{{ distgit_pagure_db_name }}' {% include "pagure_shared.cfg" %} diff --git a/roles/hosts/files/pagure-stg01.fedoraproject.org-hosts b/roles/hosts/files/pagure-stg01.fedoraproject.org-hosts deleted file mode 100644 index f61e44f312..0000000000 --- a/roles/hosts/files/pagure-stg01.fedoraproject.org-hosts +++ /dev/null @@ -1,3 +0,0 @@ -127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 -::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -127.0.0.1 db-pagure db-pagure diff --git a/roles/hosts/files/pagure01.fedoraproject.org-hosts b/roles/hosts/files/pagure01.fedoraproject.org-hosts index aafff66e5d..a96ecf9c68 100644 --- a/roles/hosts/files/pagure01.fedoraproject.org-hosts +++ b/roles/hosts/files/pagure01.fedoraproject.org-hosts @@ -1,4 +1,3 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -127.0.0.1 db-pagure db-pagure 127.0.0.1 pagure.io diff --git a/roles/hosts/files/pkgs01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/pkgs01.stg.phx2.fedoraproject.org-hosts index 99771eb457..291fc7b791 100644 --- a/roles/hosts/files/pkgs01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/pkgs01.stg.phx2.fedoraproject.org-hosts @@ -1,4 +1,3 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 10.5.126.23 infrastructure.fedoraproject.org -10.5.128.120 db-pagure db-pagure diff --git a/roles/hosts/files/pkgs02.phx2.fedoraproject.org-hosts b/roles/hosts/files/pkgs02.phx2.fedoraproject.org-hosts index a67a8ef763..291fc7b791 100644 --- a/roles/hosts/files/pkgs02.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/pkgs02.phx2.fedoraproject.org-hosts @@ -1,4 +1,3 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 10.5.126.23 infrastructure.fedoraproject.org -10.5.126.71 db-pagure db-pagure