diff --git a/data/common/common.yaml b/data/common/common.yaml --- a/data/common/common.yaml +++ b/data/common/common.yaml @@ -761,6 +761,10 @@ domains: - broker0.journal.staging.swh.network - journal0.internal.staging.swh.network + objstorage_staging: + domains: + - objstorage.staging.swh.network + - objstorage-rp.internal.staging.swh.network stats_export: domains: - stats.export.softwareheritage.org 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 @@ -123,6 +123,40 @@ swh::deploy::webapp::vhost::letsencrypt_cert: archive_staging swh::deploy::webapp::reverse_proxy::backend_http_host: webapp.internal.staging.swh.network +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::deploy::objstorage::vhost::letsencrypt_cert: objstorage_staging +swh::deploy::objstorage::reverse_proxy::backend_http_host: objstorage0.internal.staging.swh.network +swh::deploy::objstorage::reverse_proxy::backend_http_port: "%{lookup('swh::remote_service::objstorage::port')}" + +swh::deploy::objstorage::backend::public_server_name: + objstorage.staging.swh.network + objstorage.internal.staging.swh.network + +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::objstorage::backend::server_names: + - "%{alias('swh::deploy::objstorage::backend::public_server_name')}" + - "%{::swh_hostname.internal_fqdn}" + - "%{::hostname}" + - 127.0.0.1 + - localhost + - "::1" + +swh::deploy::reverse_proxy::services: + - deposit + - webapp + - objstorage + swh::postgresql::version: '12' swh::postgresql::port: 5433 swh::postgresql::cluster_name: "%{lookup('swh::postgresql::version')}/main" @@ -221,20 +255,6 @@ 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/objstorage0.internal.staging.swh.network.yaml b/data/hostname/objstorage0.internal.staging.swh.network.yaml new file mode 100644 --- /dev/null +++ b/data/hostname/objstorage0.internal.staging.swh.network.yaml @@ -0,0 +1,8 @@ +networks: + eth0: + address: 192.168.130.110 + netmask: 255.255.255.0 + gateway: 192.168.130.1 + +swh::deploy::objstorage::config: + objstorage: "%{alias('swh::remote_service::objstorage::config')}" diff --git a/data/subnets/vagrant.yaml b/data/subnets/vagrant.yaml --- a/data/subnets/vagrant.yaml +++ b/data/subnets/vagrant.yaml @@ -107,6 +107,12 @@ - inventory.internal.softwareheritage.org 10.168.130.11: host: db1.internal.staging.swh.network + 10.168.130.20: + host: rp0.internal.staging.swh.network + aliases: + - webapp.staging.swh.network + - deposit.staging.swh.network + - objstorage.staging.swh.network 10.168.130.30: host: webapp.internal.staging.swh.network 10.168.130.31: @@ -125,5 +131,7 @@ host: search-esnode0.internal.staging.swh.network 10.168.130.90: host: search0.internal.staging.swh.network + 10.168.130.110: + host: objstorage0.internal.staging.swh.network 10.168.130.200: host: clearly-defined.internal.staging.swh.network diff --git a/manifests/site.pp b/manifests/site.pp --- a/manifests/site.pp +++ b/manifests/site.pp @@ -180,6 +180,11 @@ include role::swh_journal_allinone } +# Read-only storage for mirrors +node 'objstorage0.internal.staging.swh.network' { + include role::swh_remote_objstorage +} + node 'bojimans.internal.softwareheritage.org' { include role::swh_netbox }