staging: Migration of journal0 to storage1

- update the global infrastructure schema
- update the service urls

Related to T3630

docs/infrastructure/service-urls.rst

@@ -26,7 +26,7 @@ Public urls
 +---------------------------------------+-------------------------------------------+
 | swh-objstorage read-only (for mirror) | https://objstorage.staging.swh.network    |
 +---------------------------------------+-------------------------------------------+
-| Journal TLS                           | broker0.journal.staging.swh.network:9093  |
+| Journal TLS                           | broker1.journal.staging.swh.network:9093  |
 +---------------------------------------+-------------------------------------------+
 
 Internal services
@@ -53,9 +53,9 @@ Internal services
 +--------------------------+------------------------------------------------------+--------+------------+
 | swh-vault                | http://vault.internal.staging.swh.network:5005       |        | X          |
 +--------------------------+------------------------------------------------------+--------+------------+
-| Journal plaintext        | journal0.internal.staging.swh.network:9092           |        | X          |
+| Journal plaintext        | journal1.internal.staging.swh.network:9092           |        | X          |
 +--------------------------+------------------------------------------------------+--------+------------+
-| Journal internal TLS     | journal0.internal.staging.swh.network:9094           |        | X          |
+| Journal internal TLS     | journal1.internal.staging.swh.network:9094           |        | X          |
 +--------------------------+------------------------------------------------------+--------+------------+
 
 SWH backends

sysadm/images/staging-environment.uml

@@ -8,7 +8,7 @@ actor mirror
 cloud VLAN1300 {
     interface "archive.staging.swh.network" as publicarchive
     interface "deposit.staging.swh.network" as publicdeposit
-    interface "broker0.journal.staging.swh.network" as publicjournal
+    interface "broker1.journal.staging.swh.network" as publicjournal
 }
 
 node firewall {
@@ -35,13 +35,6 @@ node pompidou {
         vaultgunicorn --> vaultcache
     }
     together {
-        node "journal0.internal.staging.swh.network" as journal0 {
-            component kafka {
-                boundary 9094
-                boundary 9093
-                boundary 9092 as kafkainternal
-            }
-        }
         node "webapp.internal.staging.swh.network" as webapp0 {
             component apache as apacheservicewebapp {
                 boundary 9080 as apachewebapp
@@ -68,11 +61,8 @@ node pompidou {
             objstoragero --> objstoragerogunicorn
         }
         depositgunicorn -down-> apachewebapp
-        webapp0 -left-> journal0
         objstorage0 -[hidden]right->deposit
         deposit -[hidden]right->webapp0
-        journal0 -[hidden]right->webapp0
-        journal0 -[hidden]right->deposit
     }
 
 
@@ -134,7 +124,6 @@ publicjournal --> firewall
 firewall -down-> 80
 firewall -down-> 443
 443 -left- 80
-firewall -down-> 9094
 ' note top: Authenticated\nconnection
 
 
@@ -147,6 +136,13 @@ together {
             boundary 5007 as indexerstorage
         }
 
+        component kafka {
+            boundary 9094
+            boundary 9093
+            boundary 9092 as kafkainternal
+        }
+
+
         component "swh-objstorage" as objstoragegunicorn
 
         component "swh-storage" as storagegunicorn
@@ -171,6 +167,8 @@ together {
     }
 }
 
+firewall -down-> 9094
+
 vaultgunicorn --> vaultdb
 vaultgunicorn --> swhscheduler
 vaultgunicorn --> storage

[Phabricator Migration user]

Some references in the commit message have been migrated:

• T3630 is now swh/infra/sysadm-environment#3630 (closed)