From bc2d388fdff54399e1868d9393d65855c025dcdc Mon Sep 17 00:00:00 2001 From: pmikus Date: Wed, 13 Dec 2023 09:51:01 +0000 Subject: fix(terraform): Remove ansible dependency - terraform ansible is not supported on aarch Signed-off-by: Peter Mikus Change-Id: Ib463e47e9d2b9cf19bc25c6ea75c516578eac374 --- fdio.infra.terraform/terraform-aws-3n-c6in/hosts.tftpl | 6 +++--- .../terraform-aws-3n-c6in/topology-3n-c6in.tftpl | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'fdio.infra.terraform/terraform-aws-3n-c6in') 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 -- cgit 1.2.3-korg