Page MenuHomeSoftware Heritage
Files F7124752

D4625.diff
No OneTemporary
Actions

D4625.diff
View Options

diff --git a/data/deployments/staging/common.yaml b/data/deployments/staging/common.yaml
--- a/data/deployments/staging/common.yaml
+++ b/data/deployments/staging/common.yaml
@@ -202,12 +202,6 @@
swh::deploy::objstorage::directory: "%{hiera('swh::deploy::storage::directory')}"
swh::deploy::objstorage::slicing: 0:1/1:5
-swh::remote_service::objstorage::config:
- cls: pathslicing
- args:
- root: "%{hiera('swh::deploy::storage::directory')}"
- slicing: "%{hiera('swh::deploy::objstorage::slicing')}"
-
# Deploy the storage server as a public resource
swh::deploy::storage::backend::listen::host: 0.0.0.0
swh::deploy::storage::backend::workers: 4
@@ -218,6 +212,20 @@
swh::deploy::indexer::storage::backend::listen::host: 0.0.0.0
swh::deploy::indexer::storage::backend::workers: 4
+
+swh::remote_service::objstorage::config::rw:
+ cls: remote
+ url: "http://storage1.internal.staging.swh.network:%{hiera('swh::remote_service::objstorage::port')}/"
+
+swh::remote_service::objstorage::config::ro:
+ cls: filtered
+ storage_conf: "%{alias('swh::remote_service::objstorage::config::rw')}"
+ filters_conf:
+ - type: readonly
+
+swh::remote_service::objstorage::config: "%{alias('swh::remote_service::objstorage::config::ro')}"
+swh::remote_service::objstorage::config::writable: "%{alias('swh::remote_service::objstorage::config::rw')}"
+
swh::deploy::indexer::storage::config:
indexer_storage:
cls: local
diff --git a/data/hostname/storage1.internal.staging.swh.network.yaml b/data/hostname/storage1.internal.staging.swh.network.yaml
--- a/data/hostname/storage1.internal.staging.swh.network.yaml
+++ b/data/hostname/storage1.internal.staging.swh.network.yaml
@@ -55,5 +55,9 @@
cls: local
args:
db: "host=%{hiera('swh::deploy::storage::db::host')} port=%{hiera('swh::deploy::storage::db::port')} user=%{hiera('swh::deploy::storage::db::user')} dbname=%{hiera('swh::deploy::storage::db::dbname')} password=%{hiera('swh::deploy::storage::db::password')}"
- objstorage: "%{alias('swh::remote_service::objstorage::config')}"
+ objstorage:
+ cls: pathslicing
+ args:
+ root: "%{hiera('swh::deploy::storage::directory')}"
+ slicing: "%{hiera('swh::deploy::objstorage::slicing')}"
journal_writer: "%{alias('swh::deploy::journal::writer::config')}"

File Metadata

Mime Type
text/plain
Expires
Dec 21 2024, 6:28 PM (11 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3217597

Event Timeline

About · Developer information · Legal