aboutsummaryrefslogtreecommitdiffstats
path: root/fdio.infra.ansible
diff options
context:
space:
mode:
Diffstat (limited to 'fdio.infra.ansible')
-rw-r--r--fdio.infra.ansible/roles/topology/tasks/main.yaml4
-rw-r--r--fdio.infra.ansible/roles/topology/templates/hosts.j22
-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