diff --git a/data/common/common.yaml b/data/common/common.yaml --- a/data/common/common.yaml +++ b/data/common/common.yaml @@ -801,10 +801,6 @@ hedgedoc: domains: - hedgedoc.softwareheritage.org - journal0.internal.staging.swh.network: - domains: - - broker0.journal.staging.swh.network - - journal0.internal.staging.swh.network objstorage_staging: domains: - objstorage.staging.swh.network 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 @@ -95,7 +95,6 @@ zookeeper::clusters: rocquencourt_staging: - '1': journal0.internal.staging.swh.network '2': storage1.internal.staging.swh.network kafka::broker::heap_opts: "-Xmx3G -Xms3G" @@ -104,12 +103,8 @@ rocquencourt_staging: zookeeper::chroot: '/kafka/softwareheritage' zookeeper::servers: - - journal0.internal.staging.swh.network - journal1.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 @@ -128,8 +123,7 @@ public_listener_network: "%{alias('kafka::cluster::public_network')}" swh::deploy::journal::brokers: - - journal0.internal.staging.swh.network - - storage1.internal.staging.swh.network + - journal1.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 @@ -193,10 +193,6 @@ host: scheduler0.internal.staging.swh.network 10.168.130.60: host: vault.internal.staging.swh.network - 10.168.130.70: - host: journal0.internal.staging.swh.network - aliases: - - broker0.journal.staging.swh.network 10.168.130.80: host: search-esnode0.internal.staging.swh.network 10.168.130.90: diff --git a/manifests/site.pp b/manifests/site.pp --- a/manifests/site.pp +++ b/manifests/site.pp @@ -194,10 +194,6 @@ include role::swh_reverse_proxy } -node 'journal0.internal.staging.swh.network' { - include role::swh_journal_allinone -} - # Read-only storage for mirrors node 'objstorage0.internal.staging.swh.network' { include role::swh_remote_objstorage diff --git a/site-modules/role/manifests/swh_journal_allinone.pp b/site-modules/role/manifests/swh_journal_allinone.pp deleted file mode 100644 --- a/site-modules/role/manifests/swh_journal_allinone.pp +++ /dev/null @@ -1,4 +0,0 @@ -class role::swh_journal_allinone inherits role::swh_journal_orchestrator { - include profile::zookeeper - include profile::kafka::broker -}