Staging instance, all changes can be removed at any time

Skip to content

Puppetfile: pgbouncer: Use commit with puppet module fix

Antoine R. Dumont requested to merge generated-differential-D1554-source into generated-differential-D1554-target

Which allows to have the right behavior, use the auth_user directive.

A PR will be opened to propose this patch as well.

Related #1784 (closed)

Test Plan

bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to update_configuration belvedere
Found host belvedere.internal.softwareheritage.org
Cloning into '/tmp/swh-ocd.0HXy9zZl/environments/production/data/private'...
done.
Cloning into '/tmp/swh-ocd.0HXy9zZl/environments/update_configuration/data/private'...
done.
*** Running octocatalog-diff on host belvedere.internal.softwareheritage.org
I, [2019-06-06T14:33:29.001353 #12488]  INFO -- : Catalogs compiled for belvedere.internal.softwareheritage.org
I, [2019-06-06T14:33:29.724061 #12488]  INFO -- : Diffs computed for belvedere.internal.softwareheritage.org
diff origin/production/belvedere.internal.softwareheritage.org current/belvedere.internal.softwareheritage.org
*******************************************
  Concat::Fragment[_postgres] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       ; Created from: pgbouncer_module_databases
      -softwareheritage = host=prado.internal.softwareheritage.org port=5433 user=postgres
      -softwareheritage-deposit = host=belvedere.internal.softwareheritage.org port=5434 user=postgres
      -softwareheritage-scheduler = host=belvedere.internal.softwareheritage.org port=5434 user=postgres
      -softwareheritage-scheduler-updater = host=belvedere.internal.softwareheritage.org port=5434 user=postgres
      +softwareheritage = host=prado.internal.softwareheritage.org port=5433 auth_user=postgres
      +softwareheritage-deposit = host=belvedere.internal.softwareheritage.org port=5434 auth_user=postgres
      +softwareheritage-scheduler = host=belvedere.internal.softwareheritage.org port=5434 auth_user=postgres
      +softwareheritage-scheduler-updater = host=belvedere.internal.softwareheritage.org port=5434 auth_user=postgres
      _
*******************************************
  Concat_fragment[_postgres] =>
   parameters =>
     content =>
      @@ -1,6 +1,6 @@
       ; Created from: pgbouncer_module_databases
      -softwareheritage = host=prado.internal.softwareheritage.org port=5433 user=postgres
      -softwareheritage-deposit = host=belvedere.internal.softwareheritage.org port=5434 user=postgres
      -softwareheritage-scheduler = host=belvedere.internal.softwareheritage.org port=5434 user=postgres
      -softwareheritage-scheduler-updater = host=belvedere.internal.softwareheritage.org port=5434 user=postgres
      +softwareheritage = host=prado.internal.softwareheritage.org port=5433 auth_user=postgres
      +softwareheritage-deposit = host=belvedere.internal.softwareheritage.org port=5434 auth_user=postgres
      +softwareheritage-scheduler = host=belvedere.internal.softwareheritage.org port=5434 auth_user=postgres
      +softwareheritage-scheduler-updater = host=belvedere.internal.softwareheritage.org port=5434 auth_user=postgres

Migrated from D1554 (view on Phabricator)

Merge request reports