diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2022-03-25 14:15:25 +0100 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2022-03-30 13:25:14 +0000 |
| commit | ad8149cc4fc9f5a703f5cffd5557abc0874d4d50 (patch) | |
| tree | 3136ab126428772784dac8d822cb72cac5bbd7f2 /fdio.infra.ansible | |
| parent | 1996a8e398190a1930607acf72c6f5ce16091e6d (diff) | |
refactor(terraform): 2n_aws_c5n
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: I5f68fd84a9ea034c5d8ff175807033aa0b60d5a2
Diffstat (limited to 'fdio.infra.ansible')
| -rw-r--r-- | fdio.infra.ansible/roles/topology/tasks/main.yaml | 4 | ||||
| -rw-r--r-- | fdio.infra.ansible/roles/topology/templates/hosts.j2 | 2 | ||||
| -rw-r--r-- | fdio.infra.ansible/roles/topology/templates/topology-2n-aws-c5n.j2 (renamed from fdio.infra.ansible/roles/topology/templates/topology_2n_aws_c5n.j2) | 0 | ||||
| -rw-r--r-- | fdio.infra.ansible/roles/topology/templates/topology-3n-aws-c5n.j2 (renamed from fdio.infra.ansible/roles/topology/templates/topology_3n_aws_c5n.j2) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/fdio.infra.ansible/roles/topology/tasks/main.yaml b/fdio.infra.ansible/roles/topology/tasks/main.yaml index a70107478e..4f94060cad 100644 --- a/fdio.infra.ansible/roles/topology/tasks/main.yaml +++ b/fdio.infra.ansible/roles/topology/tasks/main.yaml @@ -3,8 +3,8 @@ - name: Create Topology File template: - src: "templates/topology_{{ cloud_topology }}.j2" - dest: "../topologies/available/{{ cloud_topology }}_{{ testbed_name }}.yaml" + src: "templates/topology-{{ cloud_topology }}.j2" + dest: "../topologies/available/{{ cloud_topology }}-{{ testbed_name }}.yaml" tags: - create-topology-file diff --git a/fdio.infra.ansible/roles/topology/templates/hosts.j2 b/fdio.infra.ansible/roles/topology/templates/hosts.j2 index 12a992dfec..f02586cc99 100644 --- a/fdio.infra.ansible/roles/topology/templates/hosts.j2 +++ b/fdio.infra.ansible/roles/topology/templates/hosts.j2 @@ -5,5 +5,5 @@ all: {{ tg_public_ip }} sut: hosts: - {{ dut1_public_ip }} + {{ dut1_public_ip | default() }} {{ dut2_public_ip | default() }} diff --git a/fdio.infra.ansible/roles/topology/templates/topology_2n_aws_c5n.j2 b/fdio.infra.ansible/roles/topology/templates/topology-2n-aws-c5n.j2 index 1d99a34994..1d99a34994 100644 --- a/fdio.infra.ansible/roles/topology/templates/topology_2n_aws_c5n.j2 +++ b/fdio.infra.ansible/roles/topology/templates/topology-2n-aws-c5n.j2 diff --git a/fdio.infra.ansible/roles/topology/templates/topology_3n_aws_c5n.j2 b/fdio.infra.ansible/roles/topology/templates/topology-3n-aws-c5n.j2 index 631b0be63b..631b0be63b 100644 --- a/fdio.infra.ansible/roles/topology/templates/topology_3n_aws_c5n.j2 +++ b/fdio.infra.ansible/roles/topology/templates/topology-3n-aws-c5n.j2 |