Browse Source

Set correct variables for vargant test hosts

Till Klocke 9 years ago
parent
commit
ee107b377b

+ 4 - 41
playbooks/host_vars/mapserver/host.yml

@@ -1,41 +1,4 @@
-local_node: "{{supernodes[2]}}"
-
-supernode_mesh_mac: "{{local_node.mesh_mac}}"
-supernode_mesh_ipv4: "{{local_node.mesh_ip_v4}}"
-supernode_bat_macaddress: "{{local_node.bat_mac}}"
-supernode_mesh_ipv6: "{{local_node.mesh_ip_v6}}"
-supernode_local_ip: "{{local_node.public_ip|default(ansible_default_ipv4.address)}}"
-supernode_public_interface: "{{local_node.public_interface|default(ansible_default_ipv4.interface)}}"
-supernode_dhcp_range_start: "{{local_node.dhcp_range_start}}"
-supernode_dhcp_range_end: "{{local_node.dhcp_range_end}}"
-
-supernode_mesh_backbones:
-  - name: "{{supernodes[0].name}}"
-    remote_ip: "{{supernodes[0].public_ip|ipaddr('address')}}"
-    mesh_ip: "{{supernodes[0].mesh_ip_v4|ipaddr('address')}}"
-    address_v6: "{{supernodes[0].mesh_ip_v6|ipaddr('address')}}"
-    local_ip: "{{supernode_local_ip|ipaddr('address')}}"
-    interface: "{{supernode_public_interface}}"
-  - name: "{{supernodes[1].name}}"
-    remote_ip: "{{supernodes[1].public_ip|ipaddr('address')}}"
-    mesh_ip: "{{supernodes[1].mesh_ip_v4|ipaddr('address')}}"
-    address_v6: "{{supernodes[1].mesh_ip_v6|ipaddr('address')}}"
-    local_ip: "{{supernode_local_ip|ipaddr('address')}}"
-    interface: "{{supernode_public_interface}}"
-
-supernode_interfaces:
-  - name: eth0
-    auto: true
-    proto: inet
-    type: dhcp
-  - name: eth1
-    auto: true
-    proto: inet
-    type: static
-    config:
-    - key: address
-      value: "{{supernode_local_ip|ipaddr('address')}}"
-    - key: netmask
-      value: "{{supernode_local_ip|ipaddr('netmask')}}"
-    - key: broadcast
-      value: "{{supernode_local_ip|ipaddr('broadcast')}}"
+mesh_mac: 96:48:76:b5:a3:65
+bat_mac: f2:43:13:c0:d7:03
+mesh_ipv4: 10.42.0.32/16
+mesh_ipv6: fdec:16a3:681b:865c::32/64

+ 0 - 44
playbooks/host_vars/node02/supernode

@@ -1,44 +0,0 @@
-local_node: "{{supernodes[1]}}"
-
-supernode_mesh_mac: "{{local_node.mesh_mac}}"
-supernode_mesh_ipv4: "{{local_node.mesh_ip_v4}}"
-supernode_bat_macaddress: "{{local_node.bat_mac}}"
-supernode_mesh_ipv6: "{{local_node.mesh_ip_v6}}"
-supernode_local_ip: "{{local_node.public_ip|default(ansible_default_ipv4.address)}}"
-supernode_public_interface: "{{local_node.public_interface|default(ansible_default_ipv4.interface)}}"
-supernode_dhcp_range_start: "{{local_node.dhcp_range_start}}"
-supernode_dhcp_range_end: "{{local_node.dhcp_range_end}}"
-
-supernode_mesh_backbones:
-  - name: "{{supernodes[0].name}}"
-    remote_ip: "{{supernodes[0].public_ip|ipaddr('address')}}"
-    mesh_ip: "{{supernodes[0].mesh_ip_v4|ipaddr('address')}}"
-    address_v6: "{{supernodes[0].mesh_ip_v6|ipaddr('address')}}"
-    local_ip: "{{supernode_local_ip|ipaddr('address')}}"
-    interface: "{{supernode_public_interface}}"
-  - name: "{{supernodes[2].name}}"
-    remote_ip: "{{supernodes[2].public_ip|ipaddr('address')}}"
-    mesh_ip: "{{supernodes[2].mesh_ip_v4|ipaddr('address')}}"
-    address_v6: "{{supernodes[2].mesh_ip_v6|ipaddr('address')}}"
-    local_ip: "{{supernode_local_ip|ipaddr('address')}}"
-    interface: "{{supernode_public_interface}}"
-
-supernode_other_nameserver: "{{supernode_mesh_backbones|map(attribute='mesh_ip')|map('ipaddr','address')|join(', ')}}"
-supernode_other_ntp_server: "{{supernode_mesh_backbones|map(attribute='mesh_ip')|map('ipaddr','address')|join(', ')}}"
-
-supernode_interfaces:
-  - name: eth0
-    auto: true
-    proto: inet
-    type: dhcp
-  - name: eth1
-    auto: true
-    proto: inet
-    type: static
-    config:
-    - key: address
-      value: "{{supernode_local_ip|ipaddr('address')}}"
-    - key: netmask
-      value: "{{supernode_local_ip|ipaddr('netmask')}}"
-    - key: broadcast
-      value: "{{supernode_local_ip|ipaddr('broadcast')}}"

+ 6 - 0
playbooks/host_vars/node02/supernode.yml

@@ -0,0 +1,6 @@
+mesh_mac: 96:48:76:b5:a3:62
+bat_mac: f2:43:13:c0:d7:07
+mesh_ipv4: 10.42.0.16/16
+mesh_ipv6: fdec:16a3:681b:865c::16/64
+dhcp_range_start: 10.42.6.32
+dhcp_range_end: 10.42.10.254

+ 0 - 27
playbooks/host_vars/uplink01/uplink.yml

@@ -1,27 +0,0 @@
-local_uplink: "{{uplinks[0]}}"
-
-uplink_gre_tunnel:
-- name: "{{local_uplink.tunnel[0].supernode.name}}"
-  local: "{{local_uplink.public_ip|ipaddr('address')}}"
-  endpoint: "{{local_uplink.tunnel[0].supernode.public_ip|ipaddr('address')}}"
-  netmask: "{{local_uplink.tunnel[0].tunnel_ip|ipaddr('netmask')}}"
-  address: "{{local_uplink.tunnel[0].tunnel_ip|ipaddr('address')}}"
-  dstaddr: "{{local_uplink.tunnel[0].supernode.uplink_tunnel_ip|ipaddr('address')}}"
-  address_v6: "{{local_uplink.tunnel[0].address_v6}}"
-
-uplink_interfaces:
-  - name: eth0
-    auto: true
-    proto: inet
-    type: dhcp
-  - name: eth1
-    auto: true
-    proto: inet
-    type: static
-    config:
-    - key: address
-      value: "{{local_uplink.public_ip|ipaddr('address')}}"
-    - key: netmask
-      value: "{{local_uplink.public_ip|ipaddr('netmask')}}"
-    - key: broadcast
-      value: "{{local_uplink.public_ip|ipaddr('broadcast')}}"