aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpmikus <peter.mikus@protonmail.ch>2023-12-13 09:51:01 +0000
committerpmikus <peter.mikus@protonmail.ch>2023-12-13 09:51:01 +0000
commitbc2d388fdff54399e1868d9393d65855c025dcdc (patch)
tree6bff9c1ebb07ba4c076107296df889e5e7d7f053
parent53909d062efbceec183a6dfe31f7b84eaa4b0947 (diff)
fix(terraform): Remove ansible dependency
- terraform ansible is not supported on aarch Signed-off-by: Peter Mikus <peter.mikus@protonmail.ch> Change-Id: Ib463e47e9d2b9cf19bc25c6ea75c516578eac374
-rw-r--r--fdio.infra.terraform/terraform-aws-1n-aws-c5n/hosts.tftpl2
-rw-r--r--fdio.infra.terraform/terraform-aws-1n-aws-c5n/topology-1n-aws-c5n.tftpl8
-rw-r--r--fdio.infra.terraform/terraform-aws-1n-c6in/hosts.tftpl6
-rw-r--r--fdio.infra.terraform/terraform-aws-1n-c6in/topology-1n-c6in.tftpl8
-rw-r--r--fdio.infra.terraform/terraform-aws-2n-aws-c5n/hosts.tftpl4
-rw-r--r--fdio.infra.terraform/terraform-aws-2n-aws-c5n/topology-2n-aws-c5n.tftpl14
-rw-r--r--fdio.infra.terraform/terraform-aws-2n-c6gn/hosts.tftpl4
-rw-r--r--fdio.infra.terraform/terraform-aws-2n-c6gn/topology-2n-c6gn.tftpl14
-rw-r--r--fdio.infra.terraform/terraform-aws-2n-c6in/hosts.tftpl4
-rw-r--r--fdio.infra.terraform/terraform-aws-2n-c6in/topology-2n-c6in.tftpl14
-rw-r--r--fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf2
-rw-r--r--fdio.infra.terraform/terraform-aws-2n-c7gn/hosts.tftpl4
-rw-r--r--fdio.infra.terraform/terraform-aws-2n-c7gn/topology-2n-c7gn.tftpl14
-rw-r--r--fdio.infra.terraform/terraform-aws-3n-aws-c5n/hosts.tftpl6
-rw-r--r--fdio.infra.terraform/terraform-aws-3n-aws-c5n/topology-3n-aws-c5n.tftpl21
-rw-r--r--fdio.infra.terraform/terraform-aws-3n-aws-c5n/variables.tf2
-rw-r--r--fdio.infra.terraform/terraform-aws-3n-c6gn/hosts.tftpl6
-rw-r--r--fdio.infra.terraform/terraform-aws-3n-c6gn/topology-3n-c6gn.tftpl18
-rw-r--r--fdio.infra.terraform/terraform-aws-3n-c6in/hosts.tftpl6
-rw-r--r--fdio.infra.terraform/terraform-aws-3n-c6in/topology-3n-c6in.tftpl18
-rw-r--r--fdio.infra.terraform/terraform-aws-3n-c7gn/hosts.tftpl6
-rw-r--r--fdio.infra.terraform/terraform-aws-3n-c7gn/topology-3n-c7gn.tftpl18
22 files changed, 97 insertions, 102 deletions
diff --git a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/hosts.tftpl b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/hosts.tftpl
index ca371b3161..58594efe9d 100644
--- a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/hosts.tftpl
+++ b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/hosts.tftpl
@@ -2,4 +2,4 @@ all:
children:
tg:
hosts:
- {{ tg_public_ip }}
+ ${tg_public_ip} \ No newline at end of file
diff --git a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/topology-1n-aws-c5n.tftpl b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/topology-1n-aws-c5n.tftpl
index 649d7e746c..1cf63d6ded 100644
--- a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/topology-1n-aws-c5n.tftpl
+++ b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/topology-1n-aws-c5n.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,13 +18,13 @@ nodes:
interfaces:
port1:
# tg_instance/p1 - 50GE 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-50G
port2:
# tg_instance/p2 - 50GE port2 on ENA NIC.
- mac_address: {{ tg_if2_mac }}
+ mac_address: ${tg_if2_mac}
pci_address: "0000:00:07.0"
link: link1
- model: Amazon-Nitro-50G
+ model: Amazon-Nitro-50G \ No newline at end of file
diff --git a/fdio.infra.terraform/terraform-aws-1n-c6in/hosts.tftpl b/fdio.infra.terraform/terraform-aws-1n-c6in/hosts.tftpl
index f02586cc99..58594efe9d 100644
--- a/fdio.infra.terraform/terraform-aws-1n-c6in/hosts.tftpl
+++ b/fdio.infra.terraform/terraform-aws-1n-c6in/hosts.tftpl
@@ -2,8 +2,4 @@ all:
children:
tg:
hosts:
- {{ tg_public_ip }}
- sut:
- hosts:
- {{ dut1_public_ip | default() }}
- {{ dut2_public_ip | default() }}
+ ${tg_public_ip} \ No newline at end of file
diff --git a/fdio.infra.terraform/terraform-aws-1n-c6in/topology-1n-c6in.tftpl b/fdio.infra.terraform/terraform-aws-1n-c6in/topology-1n-c6in.tftpl
index 7d3f4e5318..5e8533d1a9 100644
--- a/fdio.infra.terraform/terraform-aws-1n-c6in/topology-1n-c6in.tftpl
+++ b/fdio.infra.terraform/terraform-aws-1n-c6in/topology-1n-c6in.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,13 +18,13 @@ nodes:
interfaces:
port1:
# tg_instance/p1 - 200GE 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-200G
port2:
# tg_instance/p2 - 200GE port2 on ENA NIC.
- mac_address: {{ tg_if2_mac }}
+ mac_address: ${tg_if2_mac}
pci_address: "0000:00:07.0"
link: link1
- model: Amazon-Nitro-200G
+ model: Amazon-Nitro-200G \ No newline at end of file
diff --git a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/hosts.tftpl b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/hosts.tftpl
index b943c3b0b0..cb36dbb138 100644
--- a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/hosts.tftpl
+++ b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/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-aws-c5n/topology-2n-aws-c5n.tftpl b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/topology-2n-aws-c5n.tftpl
index de43291cc6..2f2a244025 100644
--- a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/topology-2n-aws-c5n.tftpl
+++ b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/topology-2n-aws-c5n.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 - 50GE 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-50G
port2:
# tg_instance/p2 - 50GE 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-50G
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 - 50GE 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-50G
port2:
# dut1_instance/p2 - 50GE 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-50G
+ model: Amazon-Nitro-50G \ No newline at end of file
diff --git a/fdio.infra.terraform/terraform-aws-2n-c6gn/hosts.tftpl b/fdio.infra.terraform/terraform-aws-2n-c6gn/hosts.tftpl
index b943c3b0b0..cb36dbb138 100644
--- a/fdio.infra.terraform/terraform-aws-2n-c6gn/hosts.tftpl
+++ b/fdio.infra.terraform/terraform-aws-2n-c6gn/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-c6gn/topology-2n-c6gn.tftpl b/fdio.infra.terraform/terraform-aws-2n-c6gn/topology-2n-c6gn.tftpl
index e693f6c42c..eb2e4107d2 100644
--- a/fdio.infra.terraform/terraform-aws-2n-c6gn/topology-2n-c6gn.tftpl
+++ b/fdio.infra.terraform/terraform-aws-2n-c6gn/topology-2n-c6gn.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
diff --git a/fdio.infra.terraform/terraform-aws-2n-c6in/hosts.tftpl b/fdio.infra.terraform/terraform-aws-2n-c6in/hosts.tftpl
index b943c3b0b0..cb36dbb138 100644
--- a/fdio.infra.terraform/terraform-aws-2n-c6in/hosts.tftpl
+++ b/fdio.infra.terraform/terraform-aws-2n-c6in/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-c6in/topology-2n-c6in.tftpl b/fdio.infra.terraform/terraform-aws-2n-c6in/topology-2n-c6in.tftpl
index ef7b464967..e81d34cb80 100644
--- a/fdio.infra.terraform/terraform-aws-2n-c6in/topology-2n-c6in.tftpl
+++ b/fdio.infra.terraform/terraform-aws-2n-c6in/topology-2n-c6in.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 - 200GE 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-200G
port2:
# tg_instance/p2 - 200GE 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-200G
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 - 200GE 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-200G
port2:
# dut1_instance/p2 - 200GE 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-200G
+ model: Amazon-Nitro-200G \ No newline at end of file
diff --git a/fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf b/fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf
index d9d220044c..51af9587d9 100644
--- a/fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf
+++ b/fdio.infra.terraform/terraform-aws-2n-c6in/variables.tf
@@ -11,7 +11,7 @@ variable "region" {
variable "resource_prefix" {
description = "Resources name prefix."
type = string
- default = "csit-2n-c6gn"
+ default = "csit-2n-c6in"
}
variable "testbed_name" {
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
diff --git a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/hosts.tftpl b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/hosts.tftpl
index f02586cc99..e88c8ba510 100644
--- a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/hosts.tftpl
+++ b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/hosts.tftpl
@@ -2,8 +2,8 @@ all:
children:
tg:
hosts:
- {{ tg_public_ip }}
+ ${tg_public_ip}
sut:
hosts:
- {{ dut1_public_ip | default() }}
- {{ dut2_public_ip | default() }}
+ ${dut1_public_ip}
+ ${dut2_public_ip} \ No newline at end of file
diff --git a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/topology-3n-aws-c5n.tftpl b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/topology-3n-aws-c5n.tftpl
index b353aa5ad1..7df7cf3d86 100644
--- a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/topology-3n-aws-c5n.tftpl
+++ b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/topology-3n-aws-c5n.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 - 50GE 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-50G
port2:
# tg_instance/p2 - 50GE 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-50G
DUT1:
type: DUT
- host: "{{ dut1_public_ip }}"
+ host: ${dut1_public_ip}
arch: x86_64
port: 22
username: testuser
@@ -39,19 +39,19 @@ nodes:
interfaces:
port1:
# dut1_instance/p1 - 50GE 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-50G
port2:
# dut1_instance/p2 - 50GE port2 on ENA NIC.
- mac_address: {{ dut1_if2_mac }}
+ mac_address: ${dut1_if2_mac}
pci_address: "0000:00:07.0"
link: link21
model: Amazon-Nitro-50G
DUT2:
type: DUT
- host: "{{ dut2_public_ip }}"
+ host: ${dut2_public_ip}
arch: x86_64
port: 22
username: testuser
@@ -60,14 +60,13 @@ nodes:
interfaces:
port1:
# dut2_instance/p1 - 50GE port1 on ENA NIC.
- mac_address: {{ dut2_if1_mac }}
+ mac_address: ${dut2_if1_mac}
pci_address: "0000:00:06.0"
link: link21
model: Amazon-Nitro-50G
port2:
# dut2_instance/p2 - 50GE port1 on ENA NIC.
- mac_address: {{ dut2_if2_mac }}
+ mac_address: ${dut2_if2_mac}
pci_address: "0000:00:07.0"
link: link2
- model: Amazon-Nitro-50G
-
+ model: Amazon-Nitro-50G \ No newline at end of file
diff --git a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/variables.tf b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/variables.tf
index 259f720d7b..d64dd5b241 100644
--- a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/variables.tf
+++ b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/variables.tf
@@ -11,7 +11,7 @@ variable "region" {
variable "resource_prefix" {
description = "Resources name prefix."
type = string
- default = "csit-2n-aws-c5n"
+ default = "csit-3n-aws-c5n"
}
variable "testbed_name" {
diff --git a/fdio.infra.terraform/terraform-aws-3n-c6gn/hosts.tftpl b/fdio.infra.terraform/terraform-aws-3n-c6gn/hosts.tftpl
index f02586cc99..e88c8ba510 100644
--- a/fdio.infra.terraform/terraform-aws-3n-c6gn/hosts.tftpl
+++ b/fdio.infra.terraform/terraform-aws-3n-c6gn/hosts.tftpl
@@ -2,8 +2,8 @@ all:
children:
tg:
hosts:
- {{ tg_public_ip }}
+ ${tg_public_ip}
sut:
hosts:
- {{ dut1_public_ip | default() }}
- {{ dut2_public_ip | default() }}
+ ${dut1_public_ip}
+ ${dut2_public_ip} \ No newline at end of file
diff --git a/fdio.infra.terraform/terraform-aws-3n-c6gn/topology-3n-c6gn.tftpl b/fdio.infra.terraform/terraform-aws-3n-c6gn/topology-3n-c6gn.tftpl
index 295d457f49..4fb97d5511 100644
--- a/fdio.infra.terraform/terraform-aws-3n-c6gn/topology-3n-c6gn.tftpl
+++ b/fdio.infra.terraform/terraform-aws-3n-c6gn/topology-3n-c6gn.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,19 +39,19 @@ 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: link21
model: Amazon-Nitro-100G
DUT2:
type: DUT
- host: "{{ dut2_public_ip }}"
+ host: ${dut2_public_ip}
arch: x86_64
port: 22
username: testuser
@@ -60,13 +60,13 @@ nodes:
interfaces:
port1:
# dut2_instance/p1 - 100GE port1 on ENA NIC.
- mac_address: {{ dut2_if1_mac }}
+ mac_address: ${dut2_if1_mac}
pci_address: "0000:00:06.0"
link: link21
model: Amazon-Nitro-100G
port2:
# dut2_instance/p2 - 100GE port1 on ENA NIC.
- mac_address: {{ dut2_if2_mac }}
+ mac_address: ${dut2_if2_mac}
pci_address: "0000:00:07.0"
link: link2
model: Amazon-Nitro-100G
diff --git a/fdio.infra.terraform/terraform-aws-3n-c6in/hosts.tftpl b/fdio.infra.terraform/terraform-aws-3n-c6in/hosts.tftpl
index f02586cc99..e88c8ba510 100644
--- a/fdio.infra.terraform/terraform-aws-3n-c6in/hosts.tftpl
+++ b/fdio.infra.terraform/terraform-aws-3n-c6in/hosts.tftpl
@@ -2,8 +2,8 @@ all:
children:
tg:
hosts:
- {{ tg_public_ip }}
+ ${tg_public_ip}
sut:
hosts:
- {{ dut1_public_ip | default() }}
- {{ dut2_public_ip | default() }}
+ ${dut1_public_ip}
+ ${dut2_public_ip} \ No newline at end of file
diff --git a/fdio.infra.terraform/terraform-aws-3n-c6in/topology-3n-c6in.tftpl b/fdio.infra.terraform/terraform-aws-3n-c6in/topology-3n-c6in.tftpl
index c280f4e7e1..e9ecfb65b5 100644
--- a/fdio.infra.terraform/terraform-aws-3n-c6in/topology-3n-c6in.tftpl
+++ b/fdio.infra.terraform/terraform-aws-3n-c6in/topology-3n-c6in.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 - 200GE 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-200G
port2:
# tg_instance/p2 - 200GE 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-200G
DUT1:
type: DUT
- host: "{{ dut1_public_ip }}"
+ host: ${dut1_public_ip}
arch: x86_64
port: 22
username: testuser
@@ -39,19 +39,19 @@ nodes:
interfaces:
port1:
# dut1_instance/p1 - 200GE 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-200G
port2:
# dut1_instance/p2 - 200GE port2 on ENA NIC.
- mac_address: {{ dut1_if2_mac }}
+ mac_address: ${dut1_if2_mac}
pci_address: "0000:00:07.0"
link: link21
model: Amazon-Nitro-200G
DUT2:
type: DUT
- host: "{{ dut2_public_ip }}"
+ host: ${dut2_public_ip}
arch: x86_64
port: 22
username: testuser
@@ -60,13 +60,13 @@ nodes:
interfaces:
port1:
# dut2_instance/p1 - 200GE port1 on ENA NIC.
- mac_address: {{ dut2_if1_mac }}
+ mac_address: ${dut2_if1_mac}
pci_address: "0000:00:06.0"
link: link21
model: Amazon-Nitro-200G
port2:
# dut2_instance/p2 - 200GE port1 on ENA NIC.
- mac_address: {{ dut2_if2_mac }}
+ mac_address: ${dut2_if2_mac}
pci_address: "0000:00:07.0"
link: link2
model: Amazon-Nitro-200G
diff --git a/fdio.infra.terraform/terraform-aws-3n-c7gn/hosts.tftpl b/fdio.infra.terraform/terraform-aws-3n-c7gn/hosts.tftpl
index f02586cc99..e88c8ba510 100644
--- a/fdio.infra.terraform/terraform-aws-3n-c7gn/hosts.tftpl
+++ b/fdio.infra.terraform/terraform-aws-3n-c7gn/hosts.tftpl
@@ -2,8 +2,8 @@ all:
children:
tg:
hosts:
- {{ tg_public_ip }}
+ ${tg_public_ip}
sut:
hosts:
- {{ dut1_public_ip | default() }}
- {{ dut2_public_ip | default() }}
+ ${dut1_public_ip}
+ ${dut2_public_ip} \ No newline at end of file
diff --git a/fdio.infra.terraform/terraform-aws-3n-c7gn/topology-3n-c7gn.tftpl b/fdio.infra.terraform/terraform-aws-3n-c7gn/topology-3n-c7gn.tftpl
index 295d457f49..4fb97d5511 100644
--- a/fdio.infra.terraform/terraform-aws-3n-c7gn/topology-3n-c7gn.tftpl
+++ b/fdio.infra.terraform/terraform-aws-3n-c7gn/topology-3n-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,19 +39,19 @@ 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: link21
model: Amazon-Nitro-100G
DUT2:
type: DUT
- host: "{{ dut2_public_ip }}"
+ host: ${dut2_public_ip}
arch: x86_64
port: 22
username: testuser
@@ -60,13 +60,13 @@ nodes:
interfaces:
port1:
# dut2_instance/p1 - 100GE port1 on ENA NIC.
- mac_address: {{ dut2_if1_mac }}
+ mac_address: ${dut2_if1_mac}
pci_address: "0000:00:06.0"
link: link21
model: Amazon-Nitro-100G
port2:
# dut2_instance/p2 - 100GE port1 on ENA NIC.
- mac_address: {{ dut2_if2_mac }}
+ mac_address: ${dut2_if2_mac}
pci_address: "0000:00:07.0"
link: link2
model: Amazon-Nitro-100G