gnunet-svn
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-grid5k] 123/189: update url's to match node names

From: gnunet
Subject: [taler-grid5k] 123/189: update url's to match node names
Date: Thu, 28 Apr 2022 10:48:13 +0200 
This is an automated email from the git hooks/post-receive script.

marco-boss pushed a commit to branch master
in repository grid5k.

commit e3f3967700d660e0eeeacf73373fd72fad1fcf56
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Wed Apr 6 22:24:17 2022 +0200

    update url's to match node names
---
 additional/grafana/database.json                   | 144 ++++++++++-----------
 additional/rspecs/taler.any.rspec                  |   8 +-
 additional/rspecs/taler.minial.rspec               |   6 +-
 .../taler.sharded.minimal-with-wallets.rspec       |  10 +-
 additional/rspecs/taler.sharded.minimal.rspec      |   6 +-
 configs/etc/monitor/node-exporters.yaml.tpl        |   2 +-
 experiment/env                                     |  26 +---
 experiment/scripts/benchmark.sh                    |   6 +-
 experiment/scripts/exchange.sh                     |   2 +-
 experiment/scripts/helpers.sh                      |  43 ++----
 experiment/scripts/merchant.sh                     |  10 +-
 experiment/scripts/monitor.sh                      |  74 ++++++-----
 experiment/scripts/ping.sh                         |   2 +-
 experiment/scripts/proxy.sh                        |  12 +-
 experiment/scripts/run.sh                          |  46 ++-----
 experiment/scripts/setup.sh                        |  12 +-
 experiment/scripts/taler-perf.sh                   |  28 ++--
 experiment/scripts/wallet.sh                       |   2 +-
 experiment/taler.many.rspec                        |  12 +-
 experiment/taler.rspec                             |  18 +--
 experiment/taler.sharded.rspec                     |  12 +-
 21 files changed, 211 insertions(+), 270 deletions(-)

diff --git a/additional/grafana/database.json b/additional/grafana/database.json
index 924951b..e21b004 100644
--- a/additional/grafana/database.json
+++ b/additional/grafana/database.json
@@ -67,7 +67,7 @@
   "gnetId": 6742,
   "graphTooltip": 1,
   "id": null,
-  "iteration": 1649238017088,
+  "iteration": 1649276424737,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -1284,10 +1284,6 @@
       "type": "row"
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -1366,8 +1362,12 @@
       "pluginVersion": "8.2.1",
       "targets": [
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "exemplar": true,
-          "expr": "pg_stat_activity_count{instance=\"$instance\", 
datname=\"$db\", server=\"$server\"}",
+          "expr": "pg_stat_activity_count{instance=\"$instance\", 
datname=~\"taler(.*)\", server=\"$server\"}",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -1383,10 +1383,6 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
@@ -1425,8 +1421,12 @@
       "steppedLine": false,
       "targets": [
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "exemplar": true,
-          "expr": "irate(pg_stat_database_xact_commit{instance=\"$instance\", 
datname=\"$db\", server=\"$server\"}[5m])",
+          "expr": "irate(pg_stat_database_xact_commit{instance=\"$instance\", 
datname=~\"taler(.*)\", server=\"$server\"}[5m])",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -1434,8 +1434,12 @@
           "refId": "A"
         },
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "exemplar": true,
-          "expr": 
"irate(pg_stat_database_xact_rollback{instance=\"$instance\", datname=\"$db\", 
server=\"$server\"}[5m])",
+          "expr": 
"irate(pg_stat_database_xact_rollback{instance=\"$instance\", 
datname=~\"taler(.*)\", server=\"$server\"}[5m])",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -1523,7 +1527,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "exemplar": true,
-          "expr": "irate(pg_stat_database_tup_fetched{instance=\"$instance\", 
datname=\"$db\", server=\"$server\"}[5m])",
+          "expr": "irate(pg_stat_database_tup_fetched{instance=\"$instance\", 
datname=~\"taler(.*)\", server=\"$server\"}[5m])",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -1536,7 +1540,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "exemplar": true,
-          "expr": "irate(pg_stat_database_tup_returned{instance=\"$instance\", 
datname=\"$db\", server=\"$server\"}[5m])",
+          "expr": "irate(pg_stat_database_tup_returned{instance=\"$instance\", 
datname=~\"taler(.*)\", server=\"$server\"}[5m])",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -1738,7 +1742,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "exemplar": true,
-          "expr": "pg_stat_activity_max_tx_duration{instance=\"$instance\", 
datname=\"$db\", server=\"$server\"}",
+          "expr": "pg_stat_activity_max_tx_duration{instance=\"$instance\", 
datname=~\"taler(.*)\", server=\"$server\"}",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -1781,10 +1785,6 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
@@ -1822,8 +1822,12 @@
       "steppedLine": false,
       "targets": [
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "exemplar": true,
-          "expr": "pg_stat_database_blks_hit{instance=\"$instance\", 
datname=\"$db\", server=\"$server\"} / 
(pg_stat_database_blks_read{instance=\"$instance\", datname=\"$db\", 
server=\"$server\"} + pg_stat_database_blks_hit{instance=\"$instance\", 
datname=\"$db\", server=\"$server\"})",
+          "expr": "pg_stat_database_blks_hit{instance=\"$instance\", 
datname=~\"taler(.*)\", server=\"$server\"} / 
(pg_stat_database_blks_read{instance=\"$instance\", datname=~\"taler(.*)\", 
server=\"$server\"} + pg_stat_database_blks_hit{instance=\"$instance\", 
datname=~\"taler(.*)\", server=\"$server\"})",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -2008,10 +2012,6 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
@@ -2049,8 +2049,12 @@
       "steppedLine": false,
       "targets": [
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "exemplar": true,
-          "expr": "irate(pg_stat_database_conflicts{instance=\"$instance\", 
datname=\"$db\", server=\"$server\"}[5m])",
+          "expr": "irate(pg_stat_database_conflicts{instance=\"$instance\", 
datname=~\"taler(.*)\", server=\"$server\"}[5m])",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -2058,8 +2062,12 @@
           "refId": "B"
         },
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "exemplar": true,
-          "expr": "irate(pg_stat_database_deadlocks{instance=\"$instance\", 
datname=\"$db\", server=\"$server\"}[5m])",
+          "expr": "irate(pg_stat_database_deadlocks{instance=\"$instance\", 
datname=~\"taler(.*)\", server=\"$server\"}[5m])",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -2104,10 +2112,6 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
       "decimals": 0,
       "fill": 1,
       "fillGradient": 0,
@@ -2148,8 +2152,12 @@
       "steppedLine": false,
       "targets": [
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "exemplar": true,
-          "expr": "pg_locks_count{instance=\"$instance\", datname=\"$db\", 
server=\"$server\"}",
+          "expr": "pg_locks_count{instance=\"$instance\", 
datname=~\"taler(.*)\", server=\"$server\"}",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -2238,7 +2246,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "exemplar": true,
-          "expr": "irate(pg_stat_database_temp_bytes{instance=\"$instance\", 
datname=\"$db\", server=\"$server\"}[5m])",
+          "expr": "irate(pg_stat_database_temp_bytes{instance=\"$instance\", 
datname=~\"taler(.*)\", server=\"$server\"}[5m])",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -2378,10 +2386,6 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
       "editable": true,
       "error": false,
       "fill": 1,
@@ -2426,9 +2430,13 @@
       "targets": [
         {
           "alias": "fetched",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "dsType": "prometheus",
           "exemplar": true,
-          "expr": 
"sum(irate(pg_stat_database_tup_fetched{datname=~\"$db\",instance=~\"$instance\",
 server=\"$server\"}[5m]))",
+          "expr": 
"sum(irate(pg_stat_database_tup_fetched{datname=~\"taler(.*)\",instance=~\"$instance\",
 server=\"$server\"}[5m]))",
           "format": "time_series",
           "groupBy": [
             {
@@ -2482,9 +2490,13 @@
         },
         {
           "alias": "fetched",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "dsType": "prometheus",
           "exemplar": true,
-          "expr": 
"sum(irate(pg_stat_database_tup_returned{datname=~\"$db\",instance=~\"$instance\",
 server=\"$server\"}[5m]))",
+          "expr": 
"sum(irate(pg_stat_database_tup_returned{datname=~\"taler(.*)\",instance=~\"$instance\",
 server=\"$server\"}[5m]))",
           "format": "time_series",
           "groupBy": [
             {
@@ -2538,9 +2550,13 @@
         },
         {
           "alias": "fetched",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "dsType": "prometheus",
           "exemplar": true,
-          "expr": 
"sum(irate(pg_stat_database_tup_inserted{datname=~\"$db\",instance=~\"$instance\",
 server=\"$server\"}[5m]))",
+          "expr": 
"sum(irate(pg_stat_database_tup_inserted{datname=~\"taler(.*)\",instance=~\"$instance\",
 server=\"$server\"}[5m]))",
           "format": "time_series",
           "groupBy": [
             {
@@ -2594,9 +2610,13 @@
         },
         {
           "alias": "fetched",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "dsType": "prometheus",
           "exemplar": true,
-          "expr": 
"sum(irate(pg_stat_database_tup_updated{datname=~\"$db\",instance=~\"$instance\",
 server=\"$server\"}[5m]))",
+          "expr": 
"sum(irate(pg_stat_database_tup_updated{datname=~\"taler(.*)\",instance=~\"$instance\",
 server=\"$server\"}[5m]))",
           "format": "time_series",
           "groupBy": [
             {
@@ -2650,9 +2670,13 @@
         },
         {
           "alias": "fetched",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "dsType": "prometheus",
           "exemplar": true,
-          "expr": 
"sum(irate(pg_stat_database_tup_deleted{datname=~\"$db\",instance=~\"$instance\",
 server=\"$server\"}[5m]))",
+          "expr": 
"sum(irate(pg_stat_database_tup_deleted{datname=~\"taler(.*)\",instance=~\"$instance\",
 server=\"$server\"}[5m]))",
           "format": "time_series",
           "groupBy": [
             {
@@ -2739,10 +2763,6 @@
       }
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -2805,9 +2825,13 @@
       "pluginVersion": "8.4.3",
       "targets": [
         {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "dsType": "prometheus",
           "exemplar": true,
-          "expr": 
"sum(irate(pg_stat_database_xact_commit{datname=\"$db\",instance=~\"$instance\",
 server=\"$server\"}[5m])) + 
sum(irate(pg_stat_database_xact_rollback{datname=\"$db\",instance=~\"$instance\",
 server=\"$server\"}[5m]))",
+          "expr": 
"sum(irate(pg_stat_database_xact_commit{datname=~\"taler(.*)\",instance=~\"$instance\",
 server=\"$server\"}[5m])) + 
sum(irate(pg_stat_database_xact_rollback{datname=~\"taler(.*)\",instance=~\"$instance\",
 server=\"$server\"}[5m]))",
           "format": "time_series",
           "groupBy": [
             {
@@ -2899,32 +2923,6 @@
         "type": "query",
         "useTags": false
       },
-      {
-        "current": {},
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${DS_PROMETHEUS}"
-        },
-        "definition": "",
-        "hide": 0,
-        "includeAll": false,
-        "label": "Database",
-        "multi": false,
-        "name": "db",
-        "options": [],
-        "query": {
-          "query": 
"label_values(pg_stat_database_tup_fetched{datname!~\"template.*|postgres\"},datname)",
-          "refId": "Prometheus-db-Variable-Query"
-        },
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 1,
-        "tagValuesQuery": "",
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      },
       {
         "current": {},
         "datasource": {
@@ -2982,6 +2980,6 @@
   "timezone": "",
   "title": "Database",
   "uid": "2FTtdeOnk",
-  "version": 94,
+  "version": 97,
   "weekStart": ""
 }
\ No newline at end of file
diff --git a/additional/rspecs/taler.any.rspec 
b/additional/rspecs/taler.any.rspec
index 9dc9d48..c4c855e 100644
--- a/additional/rspecs/taler.any.rspec
+++ b/additional/rspecs/taler.any.rspec
@@ -6,7 +6,7 @@
     </sliver_type>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="163.0" 
y="140.5"/>
   </node>
-  <node client_id="Exchange" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="Exchange-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
@@ -18,7 +18,7 @@
     </sliver_type>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="409.0" 
y="138.5"/>
   </node>
-  <node client_id="Proxy" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="EProxy-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
@@ -30,7 +30,7 @@
     </sliver_type>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="566.5" 
y="138.5"/>
   </node>
-  <node client_id="Merchant" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="Merchant-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
@@ -186,4 +186,4 @@
     </sliver_type>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="248.5" 
y="100.5"/>
   </node>
-</rspec>
\ No newline at end of file
+</rspec>
diff --git a/additional/rspecs/taler.minial.rspec 
b/additional/rspecs/taler.minial.rspec
index 75eb12c..f18357b 100644
--- a/additional/rspecs/taler.minial.rspec
+++ b/additional/rspecs/taler.minial.rspec
@@ -7,7 +7,7 @@
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="166.0" 
y="102.5"/>
   </node>
-  <node client_id="Exchange" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="Exchange-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
@@ -21,7 +21,7 @@
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="280.0" 
y="102.5"/>
   </node>
-  <node client_id="Proxy" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="EProxy-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
@@ -42,4 +42,4 @@
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="458.0" 
y="109.5"/>
   </node>
-</rspec>
\ No newline at end of file
+</rspec>
diff --git a/additional/rspecs/taler.sharded.minimal-with-wallets.rspec 
b/additional/rspecs/taler.sharded.minimal-with-wallets.rspec
index 0e6f170..011934d 100644
--- a/additional/rspecs/taler.sharded.minimal-with-wallets.rspec
+++ b/additional/rspecs/taler.sharded.minimal-with-wallets.rspec
@@ -7,7 +7,7 @@
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="129.96073503955864" y="91.04814004376368"/>
   </node>
-  <node client_id="Exchange" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="Exchange-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
@@ -21,7 +21,7 @@
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="413.801756818745" y="79.01011581202081"/>
   </node>
-  <node client_id="Proxy" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="EProxy-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
@@ -35,7 +35,7 @@
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="873.7265700381206" y="77.06040773488321"/>
   </node>
-  <node client_id="Merchant" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="Merchant-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
@@ -143,11 +143,11 @@
     </sliver_type>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="879.2095600418041" y="244.89615915450665"/>
   </node>
-  <node client_id="Proxy-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="EProxy-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="350.95488793162536" y="162.8475631289378"/>
   </node>
-</rspec>
\ No newline at end of file
+</rspec>
diff --git a/additional/rspecs/taler.sharded.minimal.rspec 
b/additional/rspecs/taler.sharded.minimal.rspec
index 3a14872..564fe55 100644
--- a/additional/rspecs/taler.sharded.minimal.rspec
+++ b/additional/rspecs/taler.sharded.minimal.rspec
@@ -7,7 +7,7 @@
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="184.0" 
y="122.5"/>
   </node>
-  <node client_id="Exchange" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="Exchange-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
@@ -21,7 +21,7 @@
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="328.0" 
y="121.5"/>
   </node>
-  <node client_id="Proxy" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="EProxy-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
@@ -70,4 +70,4 @@
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="226.5" 
y="72.5"/>
   </node>
-</rspec>
\ No newline at end of file
+</rspec>
diff --git a/configs/etc/monitor/node-exporters.yaml.tpl 
b/configs/etc/monitor/node-exporters.yaml.tpl
index 317c194..4a0815d 100644
--- a/configs/etc/monitor/node-exporters.yaml.tpl
+++ b/configs/etc/monitor/node-exporters.yaml.tpl
@@ -3,7 +3,7 @@
     - labels:
         component: 'dns'
       targets:
-      - 'ns.${DNS_ZONE}:9100'
+      - 'ns1.${DNS_ZONE}:9100'
     - labels:
         component: 'database'
       targets: 
diff --git a/experiment/env b/experiment/env
index bd354d7..5830e9b 100644
--- a/experiment/env
+++ b/experiment/env
@@ -8,7 +8,7 @@
 # (used to determine which script to execute in run.sh)
 # Wallets are not needed explicitely since they can (and will be)
 # exported as a wildcard (*).
-NODES="Bank DB DNS Exchange Aggregator Closer Transfer Wirewatch Merchant 
Monitor Proxy Shard"
+NODES="Bank DB DNS Exchange Aggregator Closer Transfer Wirewatch Merchant 
Monitor EProxy Shard"
 
 # DNS Zone to setup inside the grid for the experiment
 DNS_ZONE=perf.taler
@@ -20,25 +20,11 @@ G5K_HOME=/root/taler/grid5k
 # configuration files
 G5K_COMMIT_SHA=master
 
-# Domain names for the hosts inside the grid.
-# The most certainly do not need to be adjusted.
-# If you do anyway, make sure the wallets and shards contain a wildcard (*)
-# and that the helpers.sh functions get_<node>_hosts are edited accordingly 
(cut)
-# Otherwise the experiment will not work
-    BANK_DOMAIN=bank.${DNS_ZONE}
-DATABASE_DOMAIN=db.${DNS_ZONE}
-     DNS_DOMAIN=ns1.${DNS_ZONE}
-EXCHANGE_DOMAIN=exchange.*.${DNS_ZONE}
-MERCHANT_DOMAIN=merchant.${DNS_ZONE}
- MONITOR_DOMAIN=monitor.${DNS_ZONE}
-   PROXY_DOMAIN=proxy.${DNS_ZONE}
-   SHARD_DOMAIN=*.${DNS_ZONE}
-# Secondary domains only important for the node dashboards
-         WALLET_DOMAIN=wallet.*.${DNS_ZONE}
-EXCH_AGGREGATOR_DOMAIN=exch-aggregator.${DNS_ZONE}
-    EXCH_CLOSER_DOMAIN=exch-closer.${DNS_ZONE}
-  EXCH_TRANSFER_DOMAIN=exch-transfer.${DNS_ZONE}
- EXCH_WIREWATCH_DOMAIN=exch-wirewatch.${DNS_ZONE}
+# The exchange which is responsible to generate key material
+PRIMARY_EXCH=Exchange-1
+
+# The dns loadbalancing domain of the exchange (proxy)
+EXCHANGE_GW_DOMAIN=exchange.${DNS_ZONE}
 
 # Arguments to pass to all taler-exchange-* binaries at startup.
 # E.g. -L INFO
diff --git a/experiment/scripts/benchmark.sh b/experiment/scripts/benchmark.sh
index 47df61c..069d2d5 100755
--- a/experiment/scripts/benchmark.sh
+++ b/experiment/scripts/benchmark.sh
@@ -30,10 +30,10 @@ function start_wallet_bench() {
       advanced ${WALLET_BENCHMARK} \
         --config-json "
   {
-    \"exchange\": \"${PROTO}://${PROXY_DOMAIN}/\",
-    \"bank\": \"http://${BANK_DOMAIN}/\";,
+    \"exchange\": \"${PROTO}://${EXCHANGE_GW_DOMAIN}/\",
+    \"bank\": \"http://bank.${DNS_ZONE}/\";,
     \"currency\": \"KUDOS\",
-    \"payto\": \"payto://x-taler-bank/${BANK_DOMAIN}/foo\",
+    \"payto\": \"payto://x-taler-bank/bank.${DNS_ZONE}/foo\",
     \"iterations\": 100000,
     \"deposits\": $((RANDOM %21)),
     \"restartAfter\": 2
diff --git a/experiment/scripts/exchange.sh b/experiment/scripts/exchange.sh
index bdda59d..6db2c23 100755
--- a/experiment/scripts/exchange.sh
+++ b/experiment/scripts/exchange.sh
@@ -73,7 +73,7 @@ function setup_primary_exchange() {
   
   taler-exchange-offline download > sig-req.json
   taler-exchange-offline sign < sig-req.json > sig-res.json
-  taler-exchange-offline enable-account 
"payto://x-taler-bank/${BANK_DOMAIN}/Exchange" > acct-res.json
+  taler-exchange-offline enable-account 
"payto://x-taler-bank/bank.${DNS_ZONE}/Exchange" > acct-res.json
   taler-exchange-offline wire-fee $(date +%Y) x-taler-bank KUDOS:0 KUDOS:0 
KUDOS:0 > fee-res.json
   taler-exchange-offline upload < sig-res.json
   taler-exchange-offline upload < acct-res.json
diff --git a/experiment/scripts/helpers.sh b/experiment/scripts/helpers.sh
index b897c03..53b717a 100755
--- a/experiment/scripts/helpers.sh
+++ b/experiment/scripts/helpers.sh
@@ -59,7 +59,7 @@ function setup_log() {
   # directory at the same time
   test -d ${HOST_LOG_DIR} || mkdir ${HOST_LOG_DIR} || true 
   # Send all logs about taler to promtail on the monitoring node
-  sed -i -e "s/<MONITOR_DOMAIN_HERE>/${MONITOR_DOMAIN}/g" \
+  sed -i -e "s/<MONITOR_DOMAIN_HERE>/monitor.${DNS_ZONE}/g" \
          -e "s|<LOG_DIR_HERE>|${HOST_LOG_DIR}|g" \
        /etc/rsyslog.d/taler.conf
   # Enable log rotating for all logs in the host log dir on NFS
@@ -75,7 +75,7 @@ function enable_logrotate() {
 # Wait for the database to be acessible by $DB_USER from remote
 function wait_for_db() {
   until PGPASSWORD="${DB_PASSWORD}" psql \
-        -h "${DATABASE_DOMAIN}" \
+        -h "db.${DNS_ZONE}" \
         -U "${DB_USER}" \
         -d "${DB_NAME}" \
        -p "${DB_PORT}" \
@@ -129,18 +129,18 @@ function setup_exchange_config_without_master_key() {
 
   AGGREGATOR_SHARD_SIZE=$(echo "2^(30-${NUM_AGGREGATOR_PROCESSES})" | bc)
 
-  sed -i 
"s\<DB_URL_HERE>\postgresql://${DB_USER}:${DB_PASSWORD}@${DATABASE_DOMAIN}:${DB_PORT}/${DB_NAME}\g"
 \
+  sed -i 
"s\<DB_URL_HERE>\postgresql://${DB_USER}:${DB_PASSWORD}@db.${DNS_ZONE}:${DB_PORT}/${DB_NAME}\g"
 \
        /etc/taler/secrets/exchange-db.secret.conf
 
   sed -i -e "s/<EXCHANGE_CIPHER_HERE>/${EXCHANGE_CIPHER}/g" \
          -e "s/<RSA_KEY_SIZE_HERE>/${RSA_KEY_SIZE}/g" \
         /etc/taler/conf.d/exchange-coins.conf
 
-  sed -i "s/<BANK_HOST_HERE>/${BANK_DOMAIN}/g" \
+  sed -i "s/<BANK_HOST_HERE>/bank.${DNS_ZONE}/g" \
        /etc/taler/secrets/exchange-accountcredentials.secret.conf
 
-  sed -i -e "s/<BANK_HOST_HERE>/${BANK_DOMAIN}/g" \
-         -e 
"s\<BASE_URL_HERE>\http://${EXCHANGE_DOMAIN//\*/${G5K_HOST}}:10000/\g"; \
+  sed -i -e "s/<BANK_HOST_HERE>/bank.${DNS_ZONE}/g" \
+         -e "s\<BASE_URL_HERE>\http://${NODE_NAME}.${DNS_ZONE}:10000/\g"; \
          -e "s/<MAX_REQUESTS_HERE>/${EXCHANGE_MAX_REQUESTS:-8192}/g" \
          -e "s/<AGGREGATOR_SHARD_SIZE_HERE>/${AGGREGATOR_SHARD_SIZE}/g" \
        /etc/taler/conf.d/exchange-business.conf
@@ -164,7 +164,7 @@ function setup_exchange_config_without_master_key() {
 # Node and to the shared log dir (NFS)
 function restart_rsyslog() {
   # rsyslg fails to apply the taler rule if remote is not reachable
-  while ! nc -z ${MONITOR_DOMAIN} 1514;
+  while ! nc -z "monitor.${DNS_ZONE}" 1514;
   do
     echo "Waiting for promtail"
     # There are issues when dnsmasq tries to resolve before the service
@@ -197,40 +197,17 @@ function stop_numbered_services() {
   done
 }
 
-# Get all Grid5000 hosts which are registered under $1
-# Returns the field which is specified in $2
+# Get all hosts which are registered under $1
+# Returns the host name - <HOST_NAME>.${DNS_ZONE}
 # $1: a regex for a domain/host to search for
-# $2: the location of the domain/host (split by .)
 function get_hosts() {
   IFS=$'\n' read -r -d '' -a HOSTS < <(\
     dig -t AXFR "${DNS_ZONE}" "@${DNS_HOSTS}" \
-    | grep ${1} | awk '{print $1}' | cut -d '.' -f $2 \
+    | grep ${1} | awk '{print $1}' | cut -d '.' -f 1 \
   )
   echo ${HOSTS[@]}
 }
 
-# Get all Grid5000 hosts which host wallets
-# Returns only the Grid5000 node - e.g. graoully-1
-function get_wallet_hosts() {
-  get_hosts "${WALLET_DOMAIN}" 2
-}
-
-# Get all shard hosts
-# returns the node name, e.g. shard-1
-function get_shard_hosts() {
-  get_hosts "shard-" 1
-}
-
-# Get all Grid5000 hosts which host secondary exchanges
-# Rerurns only the Grid5000 node - e.g. graoully-1
-function get_exchange_hosts() {
-  get_hosts "${EXCHANGE_DOMAIN}" 2
-}
-
-function get_proxy_hosts() {
-  get_hosts ".*.${PROXY_DOMAIN}" 1
-}
-
 # Create a TLS certificate for $1
 # $1: domain to create cert for
 # $2: file name x to save x.key.pem and x.cert.pem
diff --git a/experiment/scripts/merchant.sh b/experiment/scripts/merchant.sh
index a2e5ab2..59ac227 100755
--- a/experiment/scripts/merchant.sh
+++ b/experiment/scripts/merchant.sh
@@ -16,15 +16,15 @@ cd /tmp
 
 # Configurre the merchants files in /etc/taler
 function configure_merchant() {
-  wait_for_keys "${PROXY_DOMAIN}"
+  wait_for_keys "${EXCHANGE_GW_DOMAIN}"
   
   MASTER_KEY=$(
     curl -k -f \
-       "${PROXY_DOMAIN}/keys" \
+       "${EXCHANGE_GW_DOMAIN}/keys" \
        | jq -r '.master_public_key'
   )
   
-  sed -i -e "s\<EXCHANGE_URL_HERE>\http://${PROXY_DOMAIN}/\g"; \
+  sed -i -e "s\<EXCHANGE_URL_HERE>\http://${EXCHANGE_GW_DOMAIN}/\g"; \
          -e "s/<EXCHANGE_MASTER_KEY_HERE>/${MASTER_KEY}/g" \
           /etc/taler/conf.d/merchant.conf
 }
@@ -68,7 +68,7 @@ function create_instance() {
        -H "Authorization: Bearer secret-token:${TALER_MERCHANT_TOKEN}" \
        -H "Content-Type: application/json" \
        -d "{
-             \"payto_uris\": [ \"payto://x-taler-bank/${BANK_DOMAIN}/${1}\" ],
+             \"payto_uris\": [ \"payto://x-taler-bank/bank.${DNS_ZONE}/${1}\" 
],
             \"id\": \"${1}\",
             \"name\": \"${1}\",
             \"address\": {\"country\": \"CH\"},
@@ -85,7 +85,7 @@ function create_instance() {
 
 # Initialize the merchant
 function init_merchant() {
-  create_cert "${MERCHANT_DOMAIN}" "/etc/ssl/merchant"
+  create_cert "${NODE_NAME}.${DNS_ZONE}" "/etc/ssl/merchant"
   restart_rsyslog
   configure_merchant
   configure_db
diff --git a/experiment/scripts/monitor.sh b/experiment/scripts/monitor.sh
index 7c6c891..b29bb33 100755
--- a/experiment/scripts/monitor.sh
+++ b/experiment/scripts/monitor.sh
@@ -61,37 +61,34 @@ function update_grafana() {
 
 # Configure all exporters which run on this host
 function configure_prometheus_and_exporters() {
-  sed -i "s/<MERCHANT_HOST_HERE>/${MERCHANT_DOMAIN}/g" \
-       /etc/monitor/prometheus.yaml
   
-  sed -i -e 
"s\<EXCHANGE_DB_URL_HERE>\postgresql://postgres@${DATABASE_DOMAIN}:5432\g" \
+  sed -i -e 
"s\<EXCHANGE_DB_URL_HERE>\postgresql://postgres@db.${DNS_ZONE}:5432\g" \
              /etc/default/prometheus-postgres-exporter
   
   CFG=""
-  if [[ ${NUM_MERCHANTS} -gt 0 ]]; then
-    CFG="${CFG},postgresql://postgres@${MERCHANT_DOMAIN}:5432"
-    sed -i -e "s|<MERCHANT_DB_URL_HERE>|${CFG}|g" \
-          /etc/default/prometheus-postgres-exporter
-  fi
+  for MERCH in $(get_hosts "merchant"); do
+    CFG="${CFG},postgresql://postgres@${MERCH}.${DNS_ZONE}:5432"
+    sed -i "s/<MERCHANT_HOST_HERE>/${MERCH}.${DNS_ZONE}/g" \
+           /etc/monitor/prometheus.yaml
+  done
+  sed -i -e "s|<MERCHANT_DB_URL_HERE>|${CFG}|g" \
+            /etc/default/prometheus-postgres-exporter
 
   CFG=""
-  for SHARD in $(get_shard_hosts); do
-    CFG="${CFG},postgresql://postgres@${SHARD_DOMAIN//\*/${SHARD}}:5432"
+  for SHARD in $(get_hosts "shard"); do
+    CFG="${CFG},postgresql://postgres@${SHARD}.${DNS_ZONE}:5432"
   done
   sed -i "s|<SHARD_DB_URLS_HERE>|${CFG}|g" \
           /etc/default/prometheus-postgres-exporter
-  
-  sed -i "s|<PROXY_URL_HERE>|http://${PROXY_DOMAIN}/stub_status|g" \
-          /etc/default/prometheus-nginx-exporter
 }
 
 # Add wallet nodes to be monitored
 # Requires no argument since wallet nodes are retrieved from the DNS
 function add_wallet_nodes_to_prometheus() {
-  for WALLET in $(get_wallet_hosts); do
-    if ! grep -q "${WALLET_DOMAIN//\*/${WALLET}}:9100" 
/etc/monitor/prometheus.yaml; 
+  for WALLET in $(get_hosts "wallet"); do
+    if ! grep -q "${WALLET}.${DNS_ZONE}:9100" /etc/monitor/prometheus.yaml; 
     then
-      sed -i "/<WALLET_NODES_HERE>/a \ \ \ \ \ \ - 
'${WALLET_DOMAIN//\*/${WALLET}}:9100'" \
+      sed -i "/<WALLET_NODES_HERE>/a \ \ \ \ \ \ - 
'${WALLET}.${DNS_ZONE}:9100'" \
               /etc/monitor/prometheus.yaml
     fi
   done
@@ -100,10 +97,10 @@ function add_wallet_nodes_to_prometheus() {
 # Add shard servers to be monitored
 # Requires no argument, since servers are retrieved from dns
 function add_proxy_nodes_to_prometheus() {
-  for HOST in $(get_proxy_hosts); do
-    if ! grep -q "${HOST}.${PROXY_DOMAIN}:9100" /etc/monitor/prometheus.yaml;
+  for HOST in $(get_hosts "eproxy"); do
+    if ! grep -q "${HOST}.${DNS_ZONE}:9100" /etc/monitor/prometheus.yaml;
     then
-      sed -i "/<PROXY_NODES_HERE>/a \ \ \ \ \ \ - 
'${HOST}.${PROXY_DOMAIN}:9100'" \
+      sed -i "/<PROXY_NODES_HERE>/a \ \ \ \ \ \ - '${HOST}.${DNS_ZONE}:9100'" \
               /etc/monitor/prometheus.yaml
     fi
   done
@@ -112,10 +109,22 @@ function add_proxy_nodes_to_prometheus() {
 # Add shard servers to be monitored
 # Requires no argument, since servers are retrieved from dns
 function add_shard_nodes_to_prometheus() {
-  for SHARD in $(get_shard_hosts); do
+  for SHARD in $(get_hosts "shard"); do
     if ! grep -q "${SHARD}" /etc/monitor/prometheus.yaml;
     then
-      sed -i "/<SHARD_NODES_HERE>/a \ \ \ \ \ \ - 
'${SHARD_DOMAIN//\*/${SHARD}}:9100'" \
+      sed -i "/<SHARD_NODES_HERE>/a \ \ \ \ \ \ - '${SHARD}.${DNS_ZONE}:9100'" 
\
+              /etc/monitor/prometheus.yaml
+    fi
+  done
+}
+
+# Add shard servers to be monitored
+# Requires no argument, since servers are retrieved from dns
+function add_merchant_nodes_to_prometheus() {
+  for SHARD in $(get_hosts "merchant"); do
+    if ! grep -q "${MERCH}" /etc/monitor/prometheus.yaml;
+    then
+      sed -i "/<MERCHANT_NODES_HERE>/a \ \ \ \ \ \ - 
'${MERCH}.${DNS_ZONE}:9100'" \
               /etc/monitor/prometheus.yaml
     fi
   done
@@ -124,10 +133,10 @@ function add_shard_nodes_to_prometheus() {
 # Add exchange servers to be monitored
 # Requires no argument, since servers are retrieved from dns
 function add_exchange_nodes_to_prometheus() {
-  for EXCH in $(get_exchange_hosts); do
+  for EXCH in $(get_hosts "exchange-"); do
     if ! grep -q "${EXCH}" /etc/monitor/prometheus.yaml;
     then
-      sed -i "/<EXCHANGE_NODES_HERE>/a \ \ \ \ \ \ - 
'${EXCHANGE_DOMAIN//\*/${EXCH}}:9100'" \
+      sed -i "/<EXCHANGE_NODES_HERE>/a \ \ \ \ \ \ - 
'${EXCH}.${DNS_ZONE}:9100'" \
               /etc/monitor/prometheus.yaml
     fi
   done
@@ -141,13 +150,13 @@ function add_exchanges_to_prometheus() {
   let "START=$1+10000"
   let "END=$START+$2-1"
 
-  HOSTS=$(get_exchange_hosts)
+  HOSTS=$(get_hosts "exchange-")
 
   for PORT in $(seq $START $END); do
     for HOST in $HOSTS; do 
-      if ! grep -q "${EXCHANGE_DOMAIN//\*/${HOST}}:${PORT}" 
/etc/monitor/prometheus.yaml;
+      if ! grep -q "${HOST}.${DNS_ZONE}:${PORT}" /etc/monitor/prometheus.yaml;
       then
-        sed -i "/<EXCHANGES_HERE>/a  \ \ \ \ \ \ - 
'${EXCHANGE_DOMAIN//\*/${HOST}}:${PORT}'" \
+        sed -i "/<EXCHANGES_HERE>/a  \ \ \ \ \ \ - 
'${HOST}.${DNS_ZONE}:${PORT}'" \
                 /etc/monitor/prometheus.yaml
       fi
     done
@@ -165,11 +174,11 @@ function remove_exchanges_from_prometheus() {
   let "START=$1+10000"
   let "END=$START-$2"
 
-  HOSTS=$(get_exchange_hosts)
+  HOSTS=$(get_hosts "exchange-")
 
   for PORT in $(seq $END $START); do
     for HOST in $HOSTS; do
-      sed -i "/${EXCHANGE_DOMAIN//\*/${HOST}}:${PORT}/d" \
+      sed -i "/${HOST}.${DNS_ZONE}:${PORT}/d" \
               /etc/monitor/prometheus.yaml
     done
   done
@@ -185,7 +194,7 @@ function init_monitor() {
                     promtail
   
   
-  wait_for_keys "${PROXY_DOMAIN}"
+  wait_for_keys "${EXCHANGE_GW_DOMAIN}"
   
   if [[ "${ENABLE_EXPORTERS}" == "true" ]]; then
     if ! grep -q "job_name: 'nodes'" /etc/monitor/prometheus.yaml; then 
@@ -193,16 +202,17 @@ function init_monitor() {
            envsubst >> /etc/monitor/prometheus.yaml
       add_wallet_nodes_to_prometheus
       add_shard_nodes_to_prometheus
+      add_merchant_nodes_to_prometheus
       add_proxy_nodes_to_prometheus
       add_exchange_nodes_to_prometheus
     fi
   fi
 
   # Add nginx exporters
-  for HOST in $(get_proxy_hosts); do
-    if ! grep -q "${HOST}.${PROXY_DOMAIN}:9113" /etc/monitor/prometheus.yaml;
+  for HOST in $(get_hosts "eproxy"); do
+    if ! grep -q "${HOST}.${DNS_ZONE}:9113" /etc/monitor/prometheus.yaml;
     then
-      sed -i "/<NGINX_EXPORTERS_HERE>/a \ \ \ \ \ \ - 
'${HOST}.${PROXY_DOMAIN}:9113'" \
+      sed -i "/<NGINX_EXPORTERS_HERE>/a \ \ \ \ \ \ - 
'${HOST}.${DNS_ZONE}:9113'" \
               /etc/monitor/prometheus.yaml
     fi
   done
diff --git a/experiment/scripts/ping.sh b/experiment/scripts/ping.sh
index a766a7d..267f137 100755
--- a/experiment/scripts/ping.sh
+++ b/experiment/scripts/ping.sh
@@ -24,7 +24,7 @@ if [[ "${RTT}" == "time="* ]];
 then
   logger -s --tcp \
         --port 1514 \
-        --server ${MONITOR_DOMAIN} \
+        --server "monitor.${DNS_ZONE}" \
          --tag taler-network \
         "src=${TALER_HOST} dst=${1} ${RTT}" \
         || true # Ignore errors (mostly because NXDOMAIN)
diff --git a/experiment/scripts/proxy.sh b/experiment/scripts/proxy.sh
index 8aba4b6..e9bce07 100755
--- a/experiment/scripts/proxy.sh
+++ b/experiment/scripts/proxy.sh
@@ -24,11 +24,11 @@ function add_exchanges() {
   let "START=$1+10000"
   let "END=$START+$2-1"
 
-  EXCHANGES=$(get_exchange_hosts)
+  EXCHANGES=$(get_hosts "exchange-")
 
   for PORT in $(seq $START $END); do
     for HOST in ${EXCHANGES}; do
-      sed -i -e "/<SERVERS_HERE>/a \ \ server 
${EXCHANGE_DOMAIN//\*/${HOST}}:${PORT};" \
+      sed -i -e "/<SERVERS_HERE>/a \ \ server ${HOST}.${DNS_ZONE}:${PORT};" \
               /etc/nginx/sites-available/proxy
     done
   done
@@ -37,7 +37,7 @@ function add_exchanges() {
 # Setup the node and proxy configuration
 function setup_config() {
 
-  sed -i -e "s/<PROXY_DOMAIN_HERE>/${PROXY_DOMAIN}/g" \
+  sed -i -e "s/<EXCHANGE_GW_DOMAIN_HERE>/${EXCHANGE_GW_DOMAIN}/g" \
          /etc/nginx/sites-available/proxy
 
   
@@ -70,7 +70,7 @@ function setup_config() {
 
 # Initialize and start the proxy
 function init_proxy() {
-  create_cert "${PROXY_DOMAIN}" "/etc/ssl/proxy"
+  create_cert "${EXCHANGE_GW_DOMAIN}" "/etc/ssl/proxy"
   setup_config
 
   # Setup the directory where Ngxinx will place its cache
@@ -98,11 +98,11 @@ function remove_exchanges() {
   let "START=$1+10000"
   let "END=$START-$2"
 
-  EXCHANGES=$(get_exchange_hosts)
+  EXCHANGES=$(get_hosts "exchange-")
 
   for PORT in $(seq $END $START); do
     for HOST in ${EXCHANGES}; do
-      sed -i "/${EXCHANGE_DOMAIN//\*/${HOST}}:${PORT};/d" \
+      sed -i "/${HOST}.${DNS_ZONE}:${PORT};/d" \
             /etc/nginx/sites-available/proxy
     done
   done
diff --git a/experiment/scripts/run.sh b/experiment/scripts/run.sh
index 6273431..502a71a 100644
--- a/experiment/scripts/run.sh
+++ b/experiment/scripts/run.sh
@@ -10,91 +10,69 @@ then
   systemctl restart prometheus-node-exporter
 fi
 
+set_ddn ${NODE_NAME}.${DNS_ZONE}
+set_host ${NODE_NAME}
+
 if [[ "${HOSTNAME}" =~ ${BANK_HOSTS} ]]; then 
-    set_host ${NODE_NAME}
-    set_ddn ${BANK_DOMAIN}
     setup_log
     enable_logrotate
     exec ~/scripts/bank.sh init
 elif [[ "${HOSTNAME}" =~ ${DB_HOSTS} ]]; then 
-    set_host ${NODE_NAME}
-    set_ddn ${DATABASE_DOMAIN}
     setup_log
     enable_logrotate
     exec ~/scripts/database.sh init
 elif [[ "${HOSTNAME}" =~ ${SHARD_HOSTS} ]]; then 
-    set_host ${NODE_NAME}
-    set_ddn "${SHARD_DOMAIN//\*/${NODE_NAME}}"
     setup_log
     enable_logrotate
     exec ~/scripts/shard.sh init
 elif [[ "${HOSTNAME}" =~ ${EXCHANGE_HOSTS} ]]; then 
-    set_host ${NODE_NAME}
-    set_ddn ${EXCHANGE_DOMAIN//\*/${G5K_HOST}}
     setup_log
     enable_logrotate
-    enable_netdelay ${DATABASE_DOMAIN}
-    if [[ "${PRIMARY_EXCHANGE}" =~ "${G5K_HOST}" ]]; then
+    enable_netdelay db.${DNS_ZONE}
+    if [[ "${PRIMARY_EXCHANGE}" =~ "${NODE_NAME}" ]]; then
       exec ~/scripts/exchange.sh init-primary
     else
       exec ~/scripts/exchange.sh init-secondary
     fi
 elif [[ "${HOSTNAME}" =~ ${AGGREGATOR_HOSTS} ]]; then 
-    set_host ${NODE_NAME}
-    set_ddn ${EXCH_AGGREGATOR_DOMAIN}
     setup_log
     enable_logrotate
-    enable_netdelay ${DATABASE_DOMAIN}
+    enable_netdelay db.${DNS_ZONE}
     exec ~/scripts/exchange-aggregator.sh init
 elif [[ "${HOSTNAME}" =~ ${CLOSER_HOSTS} ]]; then 
-    set_host ${NODE_NAME}
-    set_ddn ${EXCH_CLOSER_DOMAIN}
     setup_log
     enable_logrotate
-    enable_netdelay ${DATABASE_DOMAIN}
+    enable_netdelay db.${DNS_ZONE}
     exec ~/scripts/exchange-closer.sh init
 elif [[ "${HOSTNAME}" =~ ${TRANSFER_HOSTS} ]]; then 
-    set_host ${NODE_NAME}
-    set_ddn ${EXCH_TRANSFER_DOMAIN}
     setup_log
     enable_logrotate
-    enable_netdelay ${DATABASE_DOMAIN}
+    enable_netdelay db.${DNS_ZONE}
     exec ~/scripts/exchange-transfer.sh init
 elif [[ "${HOSTNAME}" =~ ${WIREWATCH_HOSTS} ]]; then 
-    set_host ${NODE_NAME}
-    set_ddn ${EXCH_WIREWATCH_DOMAIN}
     setup_log
     enable_logrotate
-    enable_netdelay ${DATABASE_DOMAIN}
+    enable_netdelay db.${DNS_ZONE}
     exec ~/scripts/exchange-wirewatch.sh init
 elif [[ "${HOSTNAME}" =~ ${MERCHANT_HOSTS} ]]; then 
-    set_host ${NODE_NAME}
-    set_ddn ${MERCHANT_DOMAIN}
     setup_log
     enable_logrotate
     exec ~/scripts/merchant.sh init
 elif [[ "${HOSTNAME}" =~ ${MONITOR_HOSTS} ]]; then 
-    set_host ${NODE_NAME}
-    set_ddn ${MONITOR_DOMAIN}
     exec ~/scripts/monitor.sh init
-elif [[ "${HOSTNAME}" =~ ${PROXY_HOSTS} ]]; then 
-    set_host ${NODE_NAME}
+elif [[ "${HOSTNAME}" =~ ${EPROXY_HOSTS} ]]; then 
     # Single domain for DNS load balancing
-    set_ddn ${PROXY_DOMAIN}
+    set_ddn ${EXCHANGE_GW_DOMAIN}
     # We need a second domain for monitoring to
     # be able to get information about all proxies
-    set_ddn ${G5K_HOST}.${PROXY_DOMAIN}
     enable_netdelay ${PRIMARY_EXCHANGE}
     setup_log
     enable_logrotate
     exec ~/scripts/proxy.sh init
 elif [[ "${HOSTNAME}" =~ ${DNS_HOSTS} ]]; then 
-    set_host ${NODE_NAME}
     exec ~/scripts/dns.sh
 else
-    set_host wallet
-    set_ddn "${WALLET_DOMAIN//\*/${G5K_HOST}}"
-    enable_netdelay ${PROXY_DOMAIN}
+    enable_netdelay ${EXCHANGE_GW_DOMAIN}
     setup_log
     exec ~/scripts/wallet.sh init
 fi
diff --git a/experiment/scripts/setup.sh b/experiment/scripts/setup.sh
index 133a1f3..4f6ee14 100644
--- a/experiment/scripts/setup.sh
+++ b/experiment/scripts/setup.sh
@@ -36,16 +36,6 @@ function parse_experiment_nodes() {
       ~/nodes.json
     )
 
-    if [[ ${NODE} == "Exchange" ]]; then
-      # Dynamically define one exchange node as primary (the one which
-      # is responsible for key creation)
-      PRIMARY_EXCH=$(\
-          echo ${NODES_STR} | \
-          awk -F '|' '{print $1}' | \
-         cut -d '.' -f 1 \
-      )
-      echo "PRIMARY_EXCHANGE=\"${EXCHANGE_DOMAIN//\*/${PRIMARY_EXCH}}\"" >> 
~/.env
-    fi
     echo "${NODE^^}_HOSTS=\"${NODES_STR}\"" >> ~/.env
     echo "NUM_${NODE^^}S=$(echo ${NODES_STR} | awk -F '|' '{print NF}')" >> 
~/.env
   done
@@ -58,6 +48,8 @@ function parse_experiment_nodes() {
     fi
   done
 
+  echo "PRIMARY_EXCHANGE=${PRIMARY_EXCH,,}.${DNS_ZONE}" >> ~/.env
+
   echo "WALLET_HOSTS=*" >> ~/.env
 
   echo "G5K_HOST=\"$(hostname | cut -d '.' -f1)\"" >> ~/.env
diff --git a/experiment/scripts/taler-perf.sh b/experiment/scripts/taler-perf.sh
index 45ec3b5..1818298 100644
--- a/experiment/scripts/taler-perf.sh
+++ b/experiment/scripts/taler-perf.sh
@@ -12,16 +12,16 @@ function get_running_exchanges_per_host() {
 }
 
 function start_wallets() {
-  for WALLET in $(get_wallet_hosts); do
-    ssh -o StrictHostKeyChecking=no ${WALLET_DOMAIN//\*/${WALLET}} \
+  for WALLET in $(get_hosts "wallet"); do
+    ssh -o StrictHostKeyChecking=no ${WALLET}.${DNS_ZONE} \
            "/bin/bash /root/scripts/wallet.sh start 
${1:-${NUM_WALLET_PROCESSES}}" &
   done
   wait
 }
 
 function stop_wallets() {
- for WALLET in $(get_wallet_hosts); do
-   ssh -o StrictHostKeyChecking=no ${WALLET_DOMAIN//\*/${WALLET}} \
+ for WALLET in $(get_hosts "wallet"); do
+   ssh -o StrictHostKeyChecking=no ${WALLET}.${DNS_ZONE} \
           "/bin/bash /root/scripts/wallet.sh stop 
${1:-${NUM_WALLET_PROCESSES}}" &
   done
   wait
@@ -29,15 +29,15 @@ function stop_wallets() {
 
 function start_exchanges() {
   RUNNING=$(get_running_exchanges_per_host)
-  for HOST in $(get_exchange_hosts); do
-    ssh -o StrictHostKeyChecking=no ${EXCHANGE_DOMAIN//\*/${HOST}} \
+  for HOST in $(get_hosts "exchange-"); do
+    ssh -o StrictHostKeyChecking=no ${HOST}.${DNS_ZONE} \
            "/bin/bash /root/scripts/exchange.sh start 
${1:-${NUM_EXCHANGE_PROCESSES}}" 
   done
-  for HOST in $(get_proxy_hosts); do
-    ssh -o StrictHostKeyChecking=no ${HOST}.${PROXY_DOMAIN} \
+  for HOST in $(get_hosts "eproxy"); do
+    ssh -o StrictHostKeyChecking=no ${HOST}.${DNS_ZONE} \
            "/bin/bash /root/scripts/proxy.sh start ${RUNNING} 
${1:-${NUM_EXCHANGE_PROCESSES}}"
   done
-  ssh -o StrictHostKeyChecking=no ${MONITOR_DOMAIN} \
+  ssh -o StrictHostKeyChecking=no "monitor.${DNS_ZONE}" \
          "/bin/bash /root/scripts/monitor.sh start ${RUNNING} 
${1:-${NUM_EXCHANGE_PROCESSES}}"
 }
 
@@ -45,15 +45,15 @@ function stop_exchanges() {
   # must remove the exchange form the monitor host before the one from the 
nginx
   # since helpers.sh gets all exchanges from the nginx config
   RUNNING=$(get_running_exchanges_per_host)
-  ssh -A -o StrictHostKeyChecking=no ${MONITOR_DOMAIN} \
+  ssh -A -o StrictHostKeyChecking=no "monitor.${DNS_ZONE}" \
          "/bin/bash /root/scripts/monitor.sh stop-exchanges ${RUNNING} 
${1:-${NUM_EXCHANGE_PROCESSES}}"
-  for HOST in $(get_proxy_hosts); do
-    ssh -A -o StrictHostKeyChecking=no ${HOST}.${PROXY_DOMAIN} \
+  for HOST in $(get_hosts "eproxy"); do
+    ssh -A -o StrictHostKeyChecking=no ${HOST}.${DNS_ZONE} \
            "/bin/bash /root/scripts/proxy.sh stop ${RUNNING} 
${1:-${NUM_EXCHANGE_PROCESSES}}"
   done
   sleep 5
-  for HOST in $(get_exchange_hosts); do
-    ssh -o StrictHostKeyChecking=no ${EXCHANGE_DOMAIN//\*/${HOST}} \
+  for HOST in $(get_hosts "exchange-"); do
+    ssh -o StrictHostKeyChecking=no ${HOST}.${DNS_ZONE} \
            "/bin/bash /root/scripts/exchange.sh stop 
${1:-${NUM_EXCHANGE_PROCESSES}}" 
   done
 }
diff --git a/experiment/scripts/wallet.sh b/experiment/scripts/wallet.sh
index c700897..ed92bd3 100755
--- a/experiment/scripts/wallet.sh
+++ b/experiment/scripts/wallet.sh
@@ -23,7 +23,7 @@ function init_wallets() {
          /etc/rsyslog.d/taler.conf
 
   restart_rsyslog
-  wait_for_keys "${PROXY_DOMAIN}"
+  wait_for_keys "${EXCHANGE_GW_DOMAIN}"
   sleep 5
 }
 
diff --git a/experiment/taler.many.rspec b/experiment/taler.many.rspec
index 77fdf1c..4abfe99 100644
--- a/experiment/taler.many.rspec
+++ b/experiment/taler.many.rspec
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
-<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2022-03-21T18:08:33.768+01:00" 
xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1"; 
xmlns:delay="http://www.protogeni.net/resources/rspec/ext/delay/1"; 
xmlns:jfed-command="http://jfed.iminds.be/rspec/ext/jfed-command/1"; 
xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1"; 
xmlns:jfed-ssh-keys="http://jfed.iminds.be/rspec/ext/jfed-ssh-keys/1"; xmlns: 
[...]
+<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2022-04-06T21:42:37.131+02:00" 
xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1"; 
xmlns:delay="http://www.protogeni.net/resources/rspec/ext/delay/1"; 
xmlns:jfed-command="http://jfed.iminds.be/rspec/ext/jfed-command/1"; 
xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1"; 
xmlns:jfed-ssh-keys="http://jfed.iminds.be/rspec/ext/jfed-ssh-keys/1"; xmlns: 
[...]
   <node client_id="DB" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
@@ -7,7 +7,7 @@
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="97.68354430379748" y="25.0"/>
   </node>
-  <node client_id="Exchange" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="Exchange-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
@@ -21,7 +21,7 @@
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="474.7974683544304" y="25.0"/>
   </node>
-  <node client_id="Proxy" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="EProxy-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
@@ -35,7 +35,7 @@
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="915.0" 
y="92.81119637333838"/>
   </node>
-  <node client_id="Merchant" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="Merchant-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
@@ -76,7 +76,7 @@
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="913.5" 
y="137.5"/>
   </node>
-  <node client_id="Exchange-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="Exchange-2" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
@@ -443,7 +443,7 @@
     </sliver_type>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="904.9999999999999" y="564.0"/>
   </node>
-  <node client_id="Proxy-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="EProxy-2" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
diff --git a/experiment/taler.rspec b/experiment/taler.rspec
index 5df06cd..065e19a 100644
--- a/experiment/taler.rspec
+++ b/experiment/taler.rspec
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
-<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2022-03-19T12:40:15.602+01:00" 
xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1"; 
xmlns:delay="http://www.protogeni.net/resources/rspec/ext/delay/1"; 
xmlns:jfed-command="http://jfed.iminds.be/rspec/ext/jfed-command/1"; 
xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1"; 
xmlns:jfed-ssh-keys="http://jfed.iminds.be/rspec/ext/jfed-ssh-keys/1"; xmlns: 
[...]
+<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2022-04-06T21:41:56.411+02:00" 
xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1"; 
xmlns:delay="http://www.protogeni.net/resources/rspec/ext/delay/1"; 
xmlns:jfed-command="http://jfed.iminds.be/rspec/ext/jfed-command/1"; 
xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1"; 
xmlns:jfed-ssh-keys="http://jfed.iminds.be/rspec/ext/jfed-ssh-keys/1"; xmlns: 
[...]
   <node client_id="DB" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
@@ -7,12 +7,12 @@
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="203.0" 
y="96.5"/>
   </node>
-  <node client_id="Exchange" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="Exchange-2" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <hardware_type name="dahu-grenoble"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="228.0" 
y="161.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="362.0" 
y="162.5"/>
   </node>
   <node client_id="Bank" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
@@ -21,12 +21,12 @@
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="332.0" 
y="96.5"/>
   </node>
-  <node client_id="Proxy" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="EProxy-2" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <hardware_type name="dahu-grenoble"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="232.5" 
y="214.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="354.5" 
y="203.5"/>
   </node>
   <node client_id="Monitor" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
@@ -35,7 +35,7 @@
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="669.5" 
y="104.5"/>
   </node>
-  <node client_id="Merchant" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="Merchant-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
@@ -201,13 +201,13 @@
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <hardware_type name="dahu-grenoble"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="360.0" 
y="162.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="210.0" 
y="162.5"/>
   </node>
-  <node client_id="Proxy-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="EProxy-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <hardware_type name="dahu-grenoble"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="346.0" 
y="214.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="229.5" 
y="202.5"/>
   </node>
 </rspec>
\ No newline at end of file
diff --git a/experiment/taler.sharded.rspec b/experiment/taler.sharded.rspec
index 8533362..b7befef 100644
--- a/experiment/taler.sharded.rspec
+++ b/experiment/taler.sharded.rspec
@@ -7,7 +7,7 @@
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="139.0" 
y="108.5"/>
   </node>
-  <node client_id="Exchange" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="Exchange-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
@@ -21,7 +21,7 @@
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="469.5236980690462" y="93.19004524886878"/>
   </node>
-  <node client_id="Proxy" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="EProxy-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
@@ -35,7 +35,7 @@
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="1005.091281451141" y="90.710407239819"/>
   </node>
-  <node client_id="Merchant" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="Merchant-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
@@ -76,7 +76,7 @@
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="861.3861907548273" y="196.09502262443436"/>
   </node>
-  <node client_id="Exchange-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="Exchange-2" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
@@ -471,11 +471,11 @@
     </sliver_type>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="1053.152856967899" y="710.0"/>
   </node>
-  <node client_id="Proxy-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="EProxy-2" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="396.34055002925686" y="199.81447963800903"/>
   </node>
-</rspec>
\ No newline at end of file
+</rspec>

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
reply via email to
[Prev in Thread] Current Thread [Next in Thread]