Page MenuHomeSoftware Heritage
Files F7343004

D6477.id23528.diff
No OneTemporary
Actions

D6477.id23528.diff
View Options

diff --git a/data/common/common.yaml b/data/common/common.yaml
--- a/data/common/common.yaml
+++ b/data/common/common.yaml
@@ -1056,6 +1056,10 @@
type: CNAME
record: deposit-rp.internal.staging.swh.network
data: rp0.internal.staging.swh.network.
+ journal1/CNAME:
+ type: CNAME
+ record: journal1.internal.staging.swh.network
+ data: storage1.internal.staging.swh.network
# Non-puppet azure hosts
pgmirror0.euwest.azure/A:
record: pgmirror0.euwest.azure.internal.softwareheritage.org
diff --git a/data/common/kafka.yaml b/data/common/kafka.yaml
--- a/data/common/kafka.yaml
+++ b/data/common/kafka.yaml
@@ -13,7 +13,7 @@
kafka::version: '2.6.0'
kafka::scala_version: '2.13'
-kafka::mirror_url: https://mirrors.ircam.fr/pub/apache/
+kafka::mirror_url: https://archive.apache.org/dist/
kafka::logdirs:
- /srv/kafka/logdir
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
@@ -96,6 +96,7 @@
zookeeper::clusters:
rocquencourt_staging:
'1': journal0.internal.staging.swh.network
+ '2': storage1.internal.staging.swh.network
kafka::broker::heap_opts: "-Xmx3G -Xms3G"
@@ -104,10 +105,14 @@
zookeeper::chroot: '/kafka/softwareheritage'
zookeeper::servers:
- journal0.internal.staging.swh.network
+ - storage1.internal.staging.swh.network
brokers:
journal0.internal.staging.swh.network:
id: 1
public_hostname: broker0.journal.staging.swh.network
+ storage1.internal.staging.swh.network:
+ id: 2
+ public_hostname: broker1.journal.staging.swh.network
broker::heap_opts: "%{alias('kafka::broker::heap_opts')}"
superusers:
- User:swh-admin-olasd
@@ -124,6 +129,7 @@
swh::deploy::journal::brokers:
- journal0.internal.staging.swh.network
+ - storage1.internal.staging.swh.network
swh::deploy::deposit::vhost::letsencrypt_cert: deposit_staging
swh::deploy::deposit::reverse_proxy::backend_http_host: deposit.internal.staging.swh.network
diff --git a/data/subnets/vagrant.yaml b/data/subnets/vagrant.yaml
--- a/data/subnets/vagrant.yaml
+++ b/data/subnets/vagrant.yaml
@@ -187,6 +187,8 @@
host: deposit.internal.staging.swh.network
10.168.130.41:
host: storage1.internal.staging.swh.network
+ aliases:
+ - journal1.internal.staging.swh.network
10.168.130.50:
host: scheduler0.internal.staging.swh.network
10.168.130.60:
diff --git a/manifests/site.pp b/manifests/site.pp
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -159,7 +159,7 @@
}
node /^storage\d\.internal\.staging\.swh\.network$/ {
- include role::swh_storage_with_backfill_config
+ include role::swh_storage_with_journal
}
node /^worker\d\.internal\.staging\.swh\.network$/ {
diff --git a/site-modules/role/manifests/swh_storage_with_backfill_config.pp b/site-modules/role/manifests/swh_storage_with_backfill_config.pp
deleted file mode 100644
--- a/site-modules/role/manifests/swh_storage_with_backfill_config.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class role::swh_storage_with_backfill_config inherits role::swh_base_storage {
- include profile::postgresql::client
- include profile::swh::deploy::journal::backfill
-}
diff --git a/site-modules/role/manifests/swh_storage_with_journal.pp b/site-modules/role/manifests/swh_storage_with_journal.pp
new file mode 100644
--- /dev/null
+++ b/site-modules/role/manifests/swh_storage_with_journal.pp
@@ -0,0 +1,9 @@
+class role::swh_storage_with_journal inherits role::swh_base_storage {
+ include profile::postgresql::client
+ include profile::swh::deploy::journal::backfill
+
+ # journal
+ include profile::zookeeper
+ include profile::kafka::broker
+
+}

File Metadata

Mime Type
text/plain
Expires
Mar 17 2025, 6:41 PM (7 w, 3 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3225057

Event Timeline

About · Developer information · Legal