production: Add swh-svix database
Related to swh/infra/sysadm-environment#5275 (closed)
These modifications will deploy pgbouncer configuration to access swh-svix database.
Octocatalog Diff
~/_swh_src/puppet-environment (master ✔) ᐅ bin/octocatalog-diff --from production --to swh_svix_db albertina
Found host albertina.internal.softwareheritage.org
Cloning into '/tmp/swh-ocd.jZTCV4RG/swh-site'...
done.
branch 'swh_svix_db' set up to track 'origin/swh_svix_db'.
Switched to a new branch 'swh_svix_db'
branch 'mr/puppet-7-compat' set up to track 'origin/mr/puppet-7-compat'.
Switched to a new branch 'mr/puppet-7-compat'
Switched to branch 'production'
Your branch is up to date with 'origin/production'.
Auto-merging Puppetfile
[production 95759f41] WIP: Update Puppetfile for compatibility with Puppet 7
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date: Mon Nov 28 14:17:01 2022 +0100
1 file changed, 7 insertions(+), 1 deletion(-)
Switched to branch 'swh_svix_db'
Your branch is up to date with 'origin/swh_svix_db'.
Auto-merging Puppetfile
[swh_svix_db e7b5af20] WIP: Update Puppetfile for compatibility with Puppet 7
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date: Mon Nov 28 14:17:01 2022 +0100
1 file changed, 7 insertions(+), 1 deletion(-)
WARN -> Branch mr/puppet-7-compat filtered out by ignore_branch_prefixes ["mr/puppet-7-compat"]
WARN -> Branch mr/puppet-7-compat filtered out by ignore_branch_prefixes ["mr/puppet-7-compat"]
Cloning into '/tmp/swh-ocd.jZTCV4RG/environments/production/data/private'...
done.
Cloning into '/tmp/swh-ocd.jZTCV4RG/environments/swh_svix_db/data/private'...
done.
*** Running octocatalog-diff on host albertina.internal.softwareheritage.org
I, [2024-04-09T16:00:46.489779 #498281] INFO -- : Catalogs compiled for albertina.internal.softwareheritage.org
I, [2024-04-09T16:00:46.674420 #498281] INFO -- : Diffs computed for albertina.internal.softwareheritage.org
diff origin/production/albertina.internal.softwareheritage.org current/albertina.internal.softwareheritage.org
*******************************************
Concat::Fragment[_postgres] =>
parameters =>
content =>
@@ -8,4 +8,5 @@
swh-scrubber = host=albertina.internal.softwareheritage.org port=5434 auth_user=postgres
swh-masking = host=albertina.internal.softwareheritage.org port=5434 auth_user=postgres
+swh-svix = host=albertina.internal.softwareheritage.org port=5434 auth_user=postgres
* = host=127.0.0.1 port=5434 auth_user=postgres
_
*******************************************
Concat_fragment[_postgres] =>
parameters =>
content =>
@@ -8,4 +8,5 @@
swh-scrubber = host=albertina.internal.softwareheritage.org port=5434 auth_user=postgres
swh-masking = host=albertina.internal.softwareheritage.org port=5434 auth_user=postgres
+swh-svix = host=albertina.internal.softwareheritage.org port=5434 auth_user=postgres
* = host=127.0.0.1 port=5434 auth_user=postgres
_
*******************************************
Pgbouncer::Databases[pgbouncer_module_databases] =>
parameters =>
databases =>
- [{"source_db"=>"softwareheritage", "host"=>"albertina.internal.softwareheritage.org", "auth_user"=>"postgres", "port"=>"5433"}, {"source_db"=>"softwareheritage-deposit", "host"=>"albertina.internal.softwareheritage.org", "auth_user"=>"postgres", "port"=>"5434"}, {"source_db"=>"softwareheritage-scheduler", "host"=>"albertina.internal.softwareheritage.org"
, "auth_user"=>"postgres", "port"=>"5434"}, {"source_db"=>"swh-vault", "host"=>"albertina.internal.softwareheritage.org", "auth_user"=>"postgres", "port"=>"5434"}, {"source_db"=>"softwareheritage-indexer", "host"=>"albertina.internal.softwareheritage.org", "auth_user"=>"postgres", "port"=>"5435"}, {"source_db"=>"swh-web", "host"=>"albertina.internal.softwareheri
tage.org", "auth_user"=>"postgres", "port"=>"5434"}, {"source_db"=>"swh-scrubber", "host"=>"albertina.internal.softwareheritage.org", "auth_user"=>"postgres", "port"=>"5434"}, {"source_db"=>"swh-masking", "host"=>"albertina.internal.softwareheritage.org", "auth_user"=>"postgres", "port"=>"5434"}, {"source_db"=>"*", "host"=>"127.0.0.1", "auth_user"=>"postgres", "
port"=>"5434"}]
+ [{"source_db"=>"softwareheritage", "host"=>"albertina.internal.softwareheritage.org", "auth_user"=>"postgres", "port"=>"5433"}, {"source_db"=>"softwareheritage-deposit", "host"=>"albertina.internal.softwareheritage.org", "auth_user"=>"postgres", "port"=>"5434"}, {"source_db"=>"softwareheritage-scheduler", "host"=>"albertina.internal.softwareheritage.org"
, "auth_user"=>"postgres", "port"=>"5434"}, {"source_db"=>"swh-vault", "host"=>"albertina.internal.softwareheritage.org", "auth_user"=>"postgres", "port"=>"5434"}, {"source_db"=>"softwareheritage-indexer", "host"=>"albertina.internal.softwareheritage.org", "auth_user"=>"postgres", "port"=>"5435"}, {"source_db"=>"swh-web", "host"=>"albertina.internal.softwareheri
tage.org", "auth_user"=>"postgres", "port"=>"5434"}, {"source_db"=>"swh-scrubber", "host"=>"albertina.internal.softwareheritage.org", "auth_user"=>"postgres", "port"=>"5434"}, {"source_db"=>"swh-masking", "host"=>"albertina.internal.softwareheritage.org", "auth_user"=>"postgres", "port"=>"5434"}, {"source_db"=>"swh-svix", "host"=>"albertina.internal.softwareheri
tage.org", "auth_user"=>"postgres", "port"=>"5434"}, {"source_db"=>"*", "host"=>"127.0.0.1", "auth_user"=>"postgres", "port"=>"5434"}]
*******************************************
*** End octocatalog-diff on albertina.internal.softwareheritage.orgNotes that puppet agent is disabled on albertina, the modifications are already done and the pgbouncer is already reloaded (to avoid pgbouncer restart).