fix template

2022-02-24 14:09:13 +01:00
parent ecc2e332da
commit 1cb55b1fb3
2 changed files with 6 additions and 48 deletions
--- a/infrastructure/create-resources/templates/hosts.tftpl
+++ b/infrastructure/create-resources/templates/hosts.tftpl
@@ -1,23 +1,18 @@
 [serverctl_master_hosts]
 %{ for ip in serverctl_masters ~}
-${ip}
+${ip} ansible_host=${ip} wireguard_ip=${cidrhost("192.168.0.0/24", index(serverctl_mesh_nodes, ip) + 1)}
 %{ endfor ~}

 [serverctl_node_hosts]
 %{ for ip in serverctl_nodes ~}
-${ip}
-%{ endfor ~}
-
-[serverctl_mesh_nodes]
-%{ for ip in serverctl_mesh_nodes ~}
 ${ip} ansible_host=${ip} wireguard_ip=${cidrhost("192.168.0.0/24", index(serverctl_mesh_nodes, ip) + 1)}
 %{ endfor ~}

-[serverctl_mesh_nodes:vars]
-pipelining=true
-ansible_ssh_user=root
-ansible_ssh_port=22
-
 [serverctl_cluster:children]
 serverctl_master_hosts
 serverctl_node_hosts
+
+[serverctl_cluster:vars]
+pipelining=true
+ansible_ssh_user=root
+ansible_ssh_port=22