Adapt postgresql connection information on the provenance server (!417) · Merge requests · Platform / Infrastructure / Puppet / puppet-swh-site

Antoine R. Dumont requested to merge generated-differential-D6363-source into generated-differential-D6363-target Sep 28, 2021
This overrides the default .pg_service.conf to only display the provenance part both for reading and writing. Related to T3487
Test Plan

octo-diff
$ bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging met
*** Running octocatalog-diff on host met.internal.softwareheritage.org
I, [2021-09-28T14:33:58.959078 #1445369]  INFO -- : Catalogs compiled for met.internal.softwareheritage.org
I, [2021-09-28T14:33:59.262706 #1445369]  INFO -- : Diffs computed for met.internal.softwareheritage.org
diff origin/production/met.internal.softwareheritage.org current/met.internal.softwareheritage.org
*******************************************
+ File[/home/aeviso/.pg_service.conf] =>
   parameters =>
      "ensure": "file"
      "group": "aeviso"
      "mode": "0400"
      "owner": "aeviso"
      "content": >>>
# This file is managed by puppet. Local modifications will be overwritten.

[swh-provenance]
dbname=swh-provenance
host=met.internal.softwareheritage.org
port=5432
user=guest
[admin-swh-provenance]
dbname=swh-provenance
host=met.internal.softwareheritage.org
port=5432
user=swh-provenance
<<<
*******************************************
+ File[/home/aeviso/.pgpass] =>
   parameters =>
      "ensure": "file"
      "group": "aeviso"
      "mode": "0400"
      "owner": "aeviso"
      "content": >>>
# This file is managed by puppet. Local modifications will be overwritten.

#hostname:port:database:username:password
met.internal.softwareheritage.org:5432:swh-provenance:guest:guest
met.internal.softwareheritage.org:5432:swh-provenance:swh-provenance:swh-deploy-provenance-db-password
<<<
*******************************************
  File[/home/ardumont/.pg_service.conf] =>
   parameters =>
     content =>
      @@ -1,83 +1,13 @@
       # This file is managed by puppet. Local modifications will be overwritten.
      _
      -[admin-swh]
      -dbname=softwareheritage
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=swhstorage
      -[admin-swh-deposit]
      -dbname=softwareheritage-deposit
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=swhstorage
      -[admin-swh-scheduler]
      -dbname=softwareheritage-scheduler
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=swhscheduler
      -[admin-swh-vault]
      -dbname=swh-vault
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=swh-vault
      -[admin-swh-lister]
      -dbname=swh-lister
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=swh-lister
      -[admin-swh-replica]
      -dbname=softwareheritage
      -host=somerset.internal.softwareheritage.org
      -port=5432
      -user=postgres
      -[admin-swh-indexer]
      -dbname=softwareheritage-indexer
      -host=belvedere.internal.softwareheritage.org
      -port=5432
      -user=swhstorage
      -[admin-swh-web]
      -dbname=swh-web
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=swh-web
      -[swh]
      -dbname=softwareheritage
      -host=db.internal.softwareheritage.org
      +[swh-provenance]
      +dbname=swh-provenance
      +host=met.internal.softwareheritage.org
       port=5432
       user=guest
      -[swh-deposit]
      -dbname=softwareheritage-deposit
      -host=db.internal.softwareheritage.org
      +[admin-swh-provenance]
      +dbname=swh-provenance
      +host=met.internal.softwareheritage.org
       port=5432
      -user=guest
      -[swh-scheduler]
      -dbname=softwareheritage-scheduler
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=guest
      -[swh-vault]
      -dbname=swh-vault
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=guest
      -[swh-lister]
      -dbname=swh-lister
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=guest
      -[swh-replica]
      -dbname=softwareheritage
      -host=somerset.internal.softwareheritage.org
      -port=5432
      -user=guest
      -[swh-indexer]
      -dbname=softwareheritage-indexer
      -host=belvedere.internal.softwareheritage.org
      -port=5432
      -user=guest
      -[swh-web]
      -dbname=swh-web
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=guest
      +user=swh-provenance
      _
*******************************************
  File[/home/ardumont/.pgpass] =>
   parameters =>
     content =>
      @@ -2,19 +2,5 @@
      _
       #hostname:port:database:username:password
      -db.internal.softwareheritage.org:5432:softwareheritage:swhstorage:swh-deploy-storage-db-password
      -db.internal.softwareheritage.org:5432:softwareheritage-deposit:swhstorage:swh-deploy-deposit-db-password
      -db.internal.softwareheritage.org:5432:softwareheritage-scheduler:swhscheduler:swh-deploy-scheduler-db-password
      -db.internal.softwareheritage.org:5432:swh-vault:swh-vault:swh-deploy-vault-db-password
      -db.internal.softwareheritage.org:5432:swh-lister:swh-lister:swh-deploy-lister-db-password
      -somerset.internal.softwareheritage.org:5432:softwareheritage:postgres:swh-deploy-storage-db-password
      -belvedere.internal.softwareheritage.org:5432:softwareheritage-indexer:swhstorage:swh-deploy-indexer-storage-db-password
      -db.internal.softwareheritage.org:5432:swh-web:swh-web:swh-deploy-webapp-db-password
      -db.internal.softwareheritage.org:5432:softwareheritage:guest:guest
      -db.internal.softwareheritage.org:5432:softwareheritage-deposit:guest:guest
      -db.internal.softwareheritage.org:5432:softwareheritage-scheduler:guest:guest
      -db.internal.softwareheritage.org:5432:swh-vault:guest:guest
      -db.internal.softwareheritage.org:5432:swh-lister:guest:guest
      -somerset.internal.softwareheritage.org:5432:softwareheritage:guest:guest
      -belvedere.internal.softwareheritage.org:5432:softwareheritage-indexer:guest:guest
      -db.internal.softwareheritage.org:5432:swh-web:guest:guest
      +met.internal.softwareheritage.org:5432:swh-provenance:guest:guest
      +met.internal.softwareheritage.org:5432:swh-provenance:swh-provenance:swh-deploy-provenance-db-password
      _
*******************************************
+ File[/home/vsellier/.pg_service.conf] =>
   parameters =>
      "ensure": "file"
      "group": "vsellier"
      "mode": "0400"
      "owner": "vsellier"
      "content": >>>
# This file is managed by puppet. Local modifications will be overwritten.

[swh-provenance]
dbname=swh-provenance
host=met.internal.softwareheritage.org
port=5432
user=guest
[admin-swh-provenance]
dbname=swh-provenance
host=met.internal.softwareheritage.org
port=5432
user=swh-provenance
<<<
*******************************************
+ File[/home/vsellier/.pgpass] =>
   parameters =>
      "ensure": "file"
      "group": "vsellier"
      "mode": "0400"
      "owner": "vsellier"
      "content": >>>
# This file is managed by puppet. Local modifications will be overwritten.

#hostname:port:database:username:password
met.internal.softwareheritage.org:5432:swh-provenance:guest:guest
met.internal.softwareheritage.org:5432:swh-provenance:swh-provenance:swh-deploy-provenance-db-password
<<<
*******************************************
  File[/home/zack/.pg_service.conf] =>
   parameters =>
     content =>
      @@ -1,83 +1,13 @@
       # This file is managed by puppet. Local modifications will be overwritten.
      _
      -[admin-swh]
      -dbname=softwareheritage
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=swhstorage
      -[admin-swh-deposit]
      -dbname=softwareheritage-deposit
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=swhstorage
      -[admin-swh-scheduler]
      -dbname=softwareheritage-scheduler
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=swhscheduler
      -[admin-swh-vault]
      -dbname=swh-vault
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=swh-vault
      -[admin-swh-lister]
      -dbname=swh-lister
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=swh-lister
      -[admin-swh-replica]
      -dbname=softwareheritage
      -host=somerset.internal.softwareheritage.org
      -port=5432
      -user=postgres
      -[admin-swh-indexer]
      -dbname=softwareheritage-indexer
      -host=belvedere.internal.softwareheritage.org
      -port=5432
      -user=swhstorage
      -[admin-swh-web]
      -dbname=swh-web
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=swh-web
      -[swh]
      -dbname=softwareheritage
      -host=db.internal.softwareheritage.org
      +[swh-provenance]
      +dbname=swh-provenance
      +host=met.internal.softwareheritage.org
       port=5432
       user=guest
      -[swh-deposit]
      -dbname=softwareheritage-deposit
      -host=db.internal.softwareheritage.org
      +[admin-swh-provenance]
      +dbname=swh-provenance
      +host=met.internal.softwareheritage.org
       port=5432
      -user=guest
      -[swh-scheduler]
      -dbname=softwareheritage-scheduler
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=guest
      -[swh-vault]
      -dbname=swh-vault
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=guest
      -[swh-lister]
      -dbname=swh-lister
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=guest
      -[swh-replica]
      -dbname=softwareheritage
      -host=somerset.internal.softwareheritage.org
      -port=5432
      -user=guest
      -[swh-indexer]
      -dbname=softwareheritage-indexer
      -host=belvedere.internal.softwareheritage.org
      -port=5432
      -user=guest
      -[swh-web]
      -dbname=swh-web
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=guest
      +user=swh-provenance
      _
*******************************************
  File[/home/zack/.pgpass] =>
   parameters =>
     content =>
      @@ -2,19 +2,5 @@
      _
       #hostname:port:database:username:password
      -db.internal.softwareheritage.org:5432:softwareheritage:swhstorage:swh-deploy-storage-db-password
      -db.internal.softwareheritage.org:5432:softwareheritage-deposit:swhstorage:swh-deploy-deposit-db-password
      -db.internal.softwareheritage.org:5432:softwareheritage-scheduler:swhscheduler:swh-deploy-scheduler-db-password
      -db.internal.softwareheritage.org:5432:swh-vault:swh-vault:swh-deploy-vault-db-password
      -db.internal.softwareheritage.org:5432:swh-lister:swh-lister:swh-deploy-lister-db-password
      -somerset.internal.softwareheritage.org:5432:softwareheritage:postgres:swh-deploy-storage-db-password
      -belvedere.internal.softwareheritage.org:5432:softwareheritage-indexer:swhstorage:swh-deploy-indexer-storage-db-password
      -db.internal.softwareheritage.org:5432:swh-web:swh-web:swh-deploy-webapp-db-password
      -db.internal.softwareheritage.org:5432:softwareheritage:guest:guest
      -db.internal.softwareheritage.org:5432:softwareheritage-deposit:guest:guest
      -db.internal.softwareheritage.org:5432:softwareheritage-scheduler:guest:guest
      -db.internal.softwareheritage.org:5432:swh-vault:guest:guest
      -db.internal.softwareheritage.org:5432:swh-lister:guest:guest
      -somerset.internal.softwareheritage.org:5432:softwareheritage:guest:guest
      -belvedere.internal.softwareheritage.org:5432:softwareheritage-indexer:guest:guest
      -db.internal.softwareheritage.org:5432:swh-web:guest:guest
      +met.internal.softwareheritage.org:5432:swh-provenance:guest:guest
      +met.internal.softwareheritage.org:5432:swh-provenance:swh-provenance:swh-deploy-provenance-db-password
      _
*******************************************
  File[/root/.pg_service.conf] =>
   parameters =>
     content =>
      @@ -1,83 +1,13 @@
       # This file is managed by puppet. Local modifications will be overwritten.
      _
      -[admin-swh]
      -dbname=softwareheritage
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=swhstorage
      -[admin-swh-deposit]
      -dbname=softwareheritage-deposit
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=swhstorage
      -[admin-swh-scheduler]
      -dbname=softwareheritage-scheduler
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=swhscheduler
      -[admin-swh-vault]
      -dbname=swh-vault
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=swh-vault
      -[admin-swh-lister]
      -dbname=swh-lister
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=swh-lister
      -[admin-swh-replica]
      -dbname=softwareheritage
      -host=somerset.internal.softwareheritage.org
      -port=5432
      -user=postgres
      -[admin-swh-indexer]
      -dbname=softwareheritage-indexer
      -host=belvedere.internal.softwareheritage.org
      -port=5432
      -user=swhstorage
      -[admin-swh-web]
      -dbname=swh-web
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=swh-web
      -[swh]
      -dbname=softwareheritage
      -host=db.internal.softwareheritage.org
      +[swh-provenance]
      +dbname=swh-provenance
      +host=met.internal.softwareheritage.org
       port=5432
       user=guest
      -[swh-deposit]
      -dbname=softwareheritage-deposit
      -host=db.internal.softwareheritage.org
      +[admin-swh-provenance]
      +dbname=swh-provenance
      +host=met.internal.softwareheritage.org
       port=5432
      -user=guest
      -[swh-scheduler]
      -dbname=softwareheritage-scheduler
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=guest
      -[swh-vault]
      -dbname=swh-vault
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=guest
      -[swh-lister]
      -dbname=swh-lister
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=guest
      -[swh-replica]
      -dbname=softwareheritage
      -host=somerset.internal.softwareheritage.org
      -port=5432
      -user=guest
      -[swh-indexer]
      -dbname=softwareheritage-indexer
      -host=belvedere.internal.softwareheritage.org
      -port=5432
      -user=guest
      -[swh-web]
      -dbname=swh-web
      -host=db.internal.softwareheritage.org
      -port=5432
      -user=guest
      +user=swh-provenance
      _
*******************************************
  File[/root/.pgpass] =>
   parameters =>
     content =>
      @@ -2,19 +2,5 @@
      _
       #hostname:port:database:username:password
      -db.internal.softwareheritage.org:5432:softwareheritage:swhstorage:swh-deploy-storage-db-password
      -db.internal.softwareheritage.org:5432:softwareheritage-deposit:swhstorage:swh-deploy-deposit-db-password
      -db.internal.softwareheritage.org:5432:softwareheritage-scheduler:swhscheduler:swh-deploy-scheduler-db-password
      -db.internal.softwareheritage.org:5432:swh-vault:swh-vault:swh-deploy-vault-db-password
      -db.internal.softwareheritage.org:5432:swh-lister:swh-lister:swh-deploy-lister-db-password
      -somerset.internal.softwareheritage.org:5432:softwareheritage:postgres:swh-deploy-storage-db-password
      -belvedere.internal.softwareheritage.org:5432:softwareheritage-indexer:swhstorage:swh-deploy-indexer-storage-db-password
      -db.internal.softwareheritage.org:5432:swh-web:swh-web:swh-deploy-webapp-db-password
      -db.internal.softwareheritage.org:5432:softwareheritage:guest:guest
      -db.internal.softwareheritage.org:5432:softwareheritage-deposit:guest:guest
      -db.internal.softwareheritage.org:5432:softwareheritage-scheduler:guest:guest
      -db.internal.softwareheritage.org:5432:swh-vault:guest:guest
      -db.internal.softwareheritage.org:5432:swh-lister:guest:guest
      -somerset.internal.softwareheritage.org:5432:softwareheritage:guest:guest
      -belvedere.internal.softwareheritage.org:5432:softwareheritage-indexer:guest:guest
      -db.internal.softwareheritage.org:5432:swh-web:guest:guest
      +met.internal.softwareheritage.org:5432:swh-provenance:guest:guest
      +met.internal.softwareheritage.org:5432:swh-provenance:swh-provenance:swh-deploy-provenance-db-password
      _
*******************************************
*** End octocatalog-diff on met.internal.softwareheritage.org
Migrated from D6363 (view on Phabricator)
Adapt postgresql connection information on the provenance server

Test Plan

Merge request reports
