2 files changed, 9 insertions, 9 deletions
diff --git a/fdio.infra.terraform/terraform-aws-2n-c7gn/hosts.tftpl b/fdio.infra.terraform/terraform-aws-2n-c7gn/hosts.tftpl
index b943c3b0b0..cb36dbb138 100644
--- a/fdio.infra.terraform/terraform-aws-2n-c7gn/hosts.tftpl
+++ b/fdio.infra.terraform/terraform-aws-2n-c7gn/hosts.tftpl
@@ -2,7 +2,7 @@ all:
   children:
     tg:
       hosts:
-        {{ tg_public_ip }}
+        ${tg_public_ip}
     sut:
       hosts:
-        {{ dut1_public_ip | default() }}
+        ${dut1_public_ip}
+\ No newline at end of file
diff --git a/fdio.infra.terraform/terraform-aws-2n-c7gn/topology-2n-c7gn.tftpl b/fdio.infra.terraform/terraform-aws-2n-c7gn/topology-2n-c7gn.tftpl
index e693f6c42c..eb2e4107d2 100644
--- a/fdio.infra.terraform/terraform-aws-2n-c7gn/topology-2n-c7gn.tftpl
+++ b/fdio.infra.terraform/terraform-aws-2n-c7gn/topology-2n-c7gn.tftpl
@@ -10,7 +10,7 @@ nodes:
   TG:
     type: TG
     subtype: TREX
-    host: "{{ tg_public_ip }}"
+    host: ${tg_public_ip}
     arch: x86_64
     port: 22
     username: testuser
@@ -18,19 +18,19 @@ nodes:
     interfaces:
       port1:
         # tg_instance/p1 - 100GE port1 on ENA NIC.
-        mac_address: {{ tg_if1_mac }}
+        mac_address: ${tg_if1_mac}
         pci_address: "0000:00:06.0"
         link: link1
         model: Amazon-Nitro-100G
       port2:
         # tg_instance/p2 - 100GE port2 on ENA NIC.
-        mac_address: {{ tg_if2_mac }}
+        mac_address: ${tg_if2_mac}
         pci_address: "0000:00:07.0"
         link: link2
         model: Amazon-Nitro-100G
   DUT1:
     type: DUT
-    host: "{{ dut1_public_ip }}"
+    host: ${dut1_public_ip}
     arch: x86_64
     port: 22
     username: testuser
@@ -39,13 +39,13 @@ nodes:
     interfaces:
       port1:
         # dut1_instance/p1 - 100GE port1 on ENA NIC.
-        mac_address: {{ dut1_if1_mac }}
+        mac_address: ${dut1_if1_mac}
         pci_address: "0000:00:06.0"
         link: link1
         model: Amazon-Nitro-100G
       port2:
         # dut1_instance/p2 - 100GE port2 on ENA NIC.
-        mac_address: {{ dut1_if2_mac }}
+        mac_address: ${dut1_if2_mac}
         pci_address: "0000:00:07.0"
         link: link2
-        model: Amazon-Nitro-100G
+        model: Amazon-Nitro-100G
+\ No newline at end of file