Merge pull request #1417 from input-output-hk/jpraynaud/1405-use-p2p-topology-cardano-node-infra

Activate Cardano node P2P mode in infrastructure

Author: jpraynaud

mithril-infra/assets/infra.version

@@ -1 +1 @@
-0.2.1
+0.2.2

mithril-infra/mithril.bootstrap.tf

@@ -55,38 +55,6 @@ git checkout master
 git pull
 git checkout ${var.cardano_configurations_repository_commit}
 EOT
-      ,
-      <<-EOT
-# Deactivate P2P in preview
-CONFIG_JSON=$(cat /home/curry/docker/cardano-configurations/network/preview/cardano-node/config.json | jq '.EnableP2P = false') && echo $CONFIG_JSON > /home/curry/docker/cardano-configurations/network/preview/cardano-node/config.json
-cat > /home/curry/docker/cardano-configurations/network/preview/cardano-node/topology.json << EOF 
-{
-  "Producers": [
-    {
-      "addr": "preview-node.world.dev.cardano.org",
-      "port": 30002,
-      "valency": 1
-    }
-  ]
-}
-EOF
-
-# Deactivate P2P in preprod
-CONFIG_JSON=$(cat /home/curry/docker/cardano-configurations/network/preprod/cardano-node/config.json | jq '.EnableP2P = false') && echo $CONFIG_JSON > /home/curry/docker/cardano-configurations/network/preprod/cardano-node/config.json
-cat > /home/curry/docker/cardano-configurations/network/preprod/cardano-node/topology.json << EOF 
-{
-  "Producers": [
-    {
-      "addr": "preprod-node.world.dev.cardano.org",
-      "port": 30000,
-      "valency": 1
-    }
-  ]
-}
-EOF
-
-EOT
-
     ]
   }
 }

mithril-infra/mithril.signer.tf

@@ -43,19 +43,11 @@ resource "null_resource" "mithril_signer" {
       "mkdir -p /home/curry/data/${var.cardano_network}/mithril-signer-${each.key}/mithril/snapshots",
       "echo -n ${local.mithril_signers_relay_cardano_port[each.key]} > /home/curry/data/${var.cardano_network}/mithril-signer-${each.key}/cardano/pool/port",
       <<-EOT
-# Setup cardano node topology
-cat > /home/curry/data/${var.cardano_network}/mithril-signer-${each.key}/cardano/pool/topology-block-producer.json << EOF
-{
-  "Producers": [
-    {
-      "addr": "${google_compute_address.mithril-external-address.address}",
-      "port": ${local.mithril_signers_relay_cardano_port[each.key]},
-      "valency": 1
-    }
-  ]
-}
-EOF
-cat /home/curry/docker/cardano-configurations/network/${var.cardano_network}/cardano-node/topology.json | jq '.Producers[1] |= . + { "addr": "${google_compute_address.mithril-external-address.address}", "port": ${local.mithril_signers_block_producer_cardano_port[each.key]}, "valency": 1}' > /home/curry/data/${var.cardano_network}/mithril-signer-${each.key}/cardano/pool/topology-relay.json
+# Setup cardano node block producer topology
+cat /home/curry/docker/cardano-configurations/network/${var.cardano_network}/cardano-node/topology.json | jq 'del(.publicRoots[0].accessPoints[0:])' | jq '.localRoots[0].accessPoints[0] |= . + { "address": "${google_compute_address.mithril-external-address.address}", "port": ${local.mithril_signers_relay_cardano_port[each.key]}}' > /home/curry/data/${var.cardano_network}/mithril-signer-${each.key}/cardano/pool/topology-block-producer.json
+
+# Setup cardano node relay topology
+cat /home/curry/docker/cardano-configurations/network/${var.cardano_network}/cardano-node/topology.json | jq '.localRoots[0].accessPoints[0] |= . + { "address": "${google_compute_address.mithril-external-address.address}", "port": ${local.mithril_signers_block_producer_cardano_port[each.key]}}' > /home/curry/data/${var.cardano_network}/mithril-signer-${each.key}/cardano/pool/topology-relay.json
 EOT
       ,
       <<-EOT