Page MenuHomeSoftware Heritage

Clean up psql version to default to globally defined version
ClosedPublic

Authored by ardumont on Dec 14 2021, 3:03 PM.

Details

Summary

And overrides where needed

Test Plan

bin/octocatalog-diff shows nothing changes for most nodes with postgres dbs:

$ $SWH_PUPPET_ENVIRONMENT_HOME/bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging bardo
...
*** Running octocatalog-diff on host bardo.internal.admin.swh.network
I, [2021-12-14T14:46:13.603029 #2061182]  INFO -- : Catalogs compiled for bardo.internal.admin.swh.network
I, [2021-12-14T14:46:13.905342 #2061182]  INFO -- : Diffs computed for bardo.internal.admin.swh.network
I, [2021-12-14T14:46:13.905381 #2061182]  INFO -- : No differences
*** End octocatalog-diff on bardo.internal.admin.swh.network
$ $SWH_PUPPET_ENVIRONMENT_HOME/bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging bardo
...
I, [2021-12-14T14:47:29.221121 #2063123]  INFO -- : Catalogs compiled for bardo.internal.admin.swh.network
I, [2021-12-14T14:47:29.523520 #2063123]  INFO -- : Diffs computed for bardo.internal.admin.swh.network
I, [2021-12-14T14:47:29.523557 #2063123]  INFO -- : No differences
*** End octocatalog-diff on bardo.internal.admin.swh.network
$ $SWH_PUPPET_ENVIRONMENT_HOME/bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging bojimans
...
I, [2021-12-14T14:47:42.825101 #2064819]  INFO -- : Catalogs compiled for bojimans.internal.softwareheritage.org
I, [2021-12-14T14:47:43.252783 #2064819]  INFO -- : Diffs computed for bojimans.internal.softwareheritage.org
I, [2021-12-14T14:47:43.252823 #2064819]  INFO -- : No differences
*** End octocatalog-diff on bojimans.internal.softwareheritage.org
$ $SWH_PUPPET_ENVIRONMENT_HOME/bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging belvedere
...
I, [2021-12-14T14:47:56.097573 #2066527]  INFO -- : Catalogs compiled for belvedere.internal.softwareheritage.org
I, [2021-12-14T14:47:56.372295 #2066527]  INFO -- : Diffs computed for belvedere.internal.softwareheritage.org
I, [2021-12-14T14:47:56.372340 #2066527]  INFO -- : No differences
*** End octocatalog-diff on belvedere.internal.softwareheritage.org
$ $SWH_PUPPET_ENVIRONMENT_HOME/bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging db1.internal.staging.swh.network
...
I, [2021-12-14T14:48:12.033069 #2068255]  INFO -- : Catalogs compiled for db1.internal.staging.swh.network
I, [2021-12-14T14:48:12.380178 #2068255]  INFO -- : Diffs computed for db1.internal.staging.swh.network
I, [2021-12-14T14:48:12.380232 #2068255]  INFO -- : No differences
*** End octocatalog-diff on db1.internal.staging.swh.network
$ $SWH_PUPPET_ENVIRONMENT_HOME/bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging met
...
*** Running octocatalog-diff on host met.internal.softwareheritage.org
I, [2021-12-14T14:48:24.070300 #2069949]  INFO -- : Catalogs compiled for met.internal.softwareheritage.org
I, [2021-12-14T14:48:24.426006 #2069949]  INFO -- : Diffs computed for met.internal.softwareheritage.org
I, [2021-12-14T14:48:24.426043 #2069949]  INFO -- : No differences
*** End octocatalog-diff on met.internal.softwareheritage.org
$ $SWH_PUPPET_ENVIRONMENT_HOME/bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging somerset
...
I, [2021-12-14T14:51:56.946282 #2071931]  INFO -- : Catalogs compiled for somerset.internal.softwareheritage.org
I, [2021-12-14T14:51:57.197560 #2071931]  INFO -- : Diffs computed for somerset.internal.softwareheritage.org
I, [2021-12-14T14:51:57.197599 #2071931]  INFO -- : No differences
*** End octocatalog-diff on somerset.internal.softwareheritage.org
$ $SWH_PUPPET_ENVIRONMENT_HOME/bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging dbreplica0.euwest.azure
...
I, [2021-12-14T14:52:19.129067 #2073662]  INFO -- : Catalogs compiled for dbreplica0.euwest.azure.internal.softwareheritage.org
I, [2021-12-14T14:52:19.392819 #2073662]  INFO -- : Diffs computed for dbreplica0.euwest.azure.internal.softwareheritage.org
I, [2021-12-14T14:52:19.392856 #2073662]  INFO -- : No differences
*** End octocatalog-diff on dbreplica0.euwest.azure.internal.softwareheritage.org
$ $SWH_PUPPET_ENVIRONMENT_HOME/bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging dbreplica1.euwest.azure
...
I, [2021-12-14T14:52:30.427243 #2075357]  INFO -- : Catalogs compiled for dbreplica1.euwest.azure.internal.softwareheritage.org
I, [2021-12-14T14:52:30.692809 #2075357]  INFO -- : Diffs computed for dbreplica1.euwest.azure.internal.softwareheritage.org
I, [2021-12-14T14:52:30.692849 #2075357]  INFO -- : No differences
*** End octocatalog-diff on dbreplica1.euwest.azure.internal.softwareheritage.org
$ $SWH_PUPPET_ENVIRONMENT_HOME/bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging banco
...
I, [2021-12-14T14:53:02.550845 #2077056]  INFO -- : Catalogs compiled for banco.softwareheritage.org
I, [2021-12-14T14:53:02.873257 #2077056]  INFO -- : Diffs computed for banco.softwareheritage.org
I, [2021-12-14T14:53:02.873296 #2077056]  INFO -- : No differences
*** End octocatalog-diff on banco.softwareheritage.org
$ $SWH_PUPPET_ENVIRONMENT_HOME/bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging pergamon
...
I, [2021-12-14T14:57:39.908870 #2078845]  INFO -- : Catalogs compiled for pergamon.softwareheritage.org
W, [2021-12-14T14:57:41.090460 #2078845]  WARN -- : Resource File[/tmp/ocd-ipc-20211214-2078845-1hin2rd/ocd-builddir-20211214-2078847-qv5hu3/routes.yaml] appears to depend on catalog compilation directory. Suppressed from results.
W, [2021-12-14T14:57:41.090522 #2078845]  WARN -- : Resource File[/tmp/ocd-ipc-20211214-2078845-1hin2rd/ocd-builddir-20211214-2078846-1uc0mpd/routes.yaml] appears to depend on catalog compilation directory. Suppressed from results.
W, [2021-12-14T14:57:41.090640 #2078845]  WARN -- : Resource key Ini_setting[puppetdbserver_urls] parameters => path may depend on catalog compilation directory, but there may be differences. This is included in results for now, but please verify.
W, [2021-12-14T14:57:41.090657 #2078845]  WARN -- : Resource key Ini_setting[puppetdbserver_urls] parameters => path appears to depend on catalog compilation directory. Suppressed from results.
W, [2021-12-14T14:57:41.090707 #2078845]  WARN -- : Resource key Ini_setting[soft_write_failure] parameters => path may depend on catalog compilation directory, but there may be differences. This is included in results for now, but please verify.
W, [2021-12-14T14:57:41.090721 #2078845]  WARN -- : Resource key Ini_setting[soft_write_failure] parameters => path appears to depend on catalog compilation directory. Suppressed from results.
I, [2021-12-14T14:57:41.090807 #2078845]  INFO -- : Diffs computed for pergamon.softwareheritage.org
diff origin/production/pergamon.softwareheritage.org current/pergamon.softwareheritage.org
*******************************************
  File[/etc/bind/keys/local-update] =>
   parameters =>
     content =>
      @@ -2,4 +2,4 @@
       key local-update {
        algorithm hmac-sha256;
      - secret "LsOj7V7sKa4TTDU7XoQiey4TNxO8pg04/gGZs1QzqnxYsZXCJ49IQvT2XVxNQr/ua1w1CwaH++sUEx0CRiCPYw==";
      + secret "GWAVqp9yulYR1zNLiwIi5bfHVscDwkrm10Tm6jfen3gHUjpFPxZAsUJYR0EQCyPvhfJSHxv6Fhju/OmCNTO7+A==";
       };
*******************************************
  File[/etc/bind/rndc.key] =>
   parameters =>
     content =>
      @@ -2,4 +2,4 @@
       key rndc-key {
        algorithm hmac-md5;
      - secret "//GPdSGkOMsvfAwSSMqWy8yCo0MJJOLYCQoWS7bHywakHIxM7ShEHR1J7VFnJw5Dbs7qakmdUblWOJqFozUA8g==";
      + secret "7PxgoL+/gbBdfSb9TdL8ZU5wOXbei4yBa6SQAuDHNtUx41HRm8jLfmAZn9f4OpgW6GaO0yg5nF8/Qh92rCZf6Q==";
       };
*******************************************
*** End octocatalog-diff on pergamon.softwareheritage.org

Shout out if i missed some servers.

Diff Detail

Repository
rSPSITE puppet-swh-site
Branch
staging
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 25631
Build 40077: arc lint + arc unit

Event Timeline

ardumont edited the test plan for this revision. (Show Details)
ardumont edited the test plan for this revision. (Show Details)

Adapt according to suggestion

Build is green

Patch application report for D6833 (id=24774)

Rebasing onto 0b45b3ae2c...

Current branch diff-target is up to date.
Changes applied before test
commit 028fc963fa99e9ef194f320032a0a9d0df11a09a
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Mon Dec 13 14:47:56 2021 +0100

    sysadm: Add how to access the firewall nodes without vpn tutorial

See https://jenkins.softwareheritage.org/job/DDOC/job/build-on-diff/53/ for more details.

Amend due to mistyped diff update

This revision is now accepted and ready to land.Dec 16 2021, 9:54 AM