Skip to content

Make sure the deposit backend uses a writable storage for metadata

Nicolas Dandrimont requested to merge generated-differential-D5283-source into generated-differential-D5283-target

Two commits:

  • use writable storage for deposit backend
  • use guest credentials for the local storage on moma

Test Plan

octocatalog-diff on moma:

diff origin/production/moma.softwareheritage.org current/moma.softwareheritage.org
*******************************************
  File[/etc/softwareheritage/deposit/server.yml] =>
   parameters =>
     content =>
      @@ -4,12 +4,12 @@
         cls: remote
         url: http://saatchi.internal.softwareheritage.org:5008/
      -storage:
      +storage_metadata:
         cls: remote
         args:
      -    url: http://localhost:5002/
      -storage_metadata:
      +    url: http://saam.internal.softwareheritage.org:5002/
      +storage:
         cls: remote
         args:
      -    url: http://localhost:5002/
      +    url: http://saam.internal.softwareheritage.org:5002/
       private:
         secret_key: swh::deploy::deposit::runtime_secret_key
*******************************************
  File[/etc/softwareheritage/storage/storage.yml] =>
   parameters =>
     content =>
      @@ -3,6 +3,6 @@
         cls: local
         args:
      -    db: host=somerset.internal.softwareheritage.org port=5432 user=swhstorage dbname=softwareheritage
      -      password=swh-deploy-storage-db-password
      +    db: host=somerset.internal.softwareheritage.org port=5432 user=guest dbname=softwareheritage
      +      password=guest
           objstorage:
             cls: multiplexer
*******************************************

octocatalog-diff on staging deposit:

*******************************************
  File[/etc/softwareheritage/deposit/server.yml] =>
   parameters =>
     content =>
      @@ -5,9 +5,9 @@
         args:
           url: http://scheduler0.internal.staging.swh.network:5008/
      -storage:
      +storage_metadata:
         cls: remote
         args:
           url: http://storage1.internal.staging.swh.network:5002/
      -storage_metadata:
      +storage:
         cls: remote
         args:
*******************************************

(there was apparently a duplicate setting for the storage backend...)

Migrated from D5283 (view on Phabricator)

Merge request reports