diff options
| author |   pmikus <peter.mikus@protonmail.ch> | 2023-12-13 09:51:01 +0000 |
|---|---|---|
| committer | pmikus <peter.mikus@protonmail.ch> | 2023-12-13 09:51:01 +0000 |
| commit | bc2d388fdff54399e1868d9393d65855c025dcdc (patch) | |
| tree | 6bff9c1ebb07ba4c076107296df889e5e7d7f053 /fdio.infra.terraform/terraform-aws-3n-aws-c5n | |
| parent | 53909d062efbceec183a6dfe31f7b84eaa4b0947 (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
Diffstat (limited to 'fdio.infra.terraform/terraform-aws-3n-aws-c5n')
3 files changed, 14 insertions, 15 deletions
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" { |