diff --git a/group_vars/fsolgw.yml b/group_vars/fsolgw.yml index b46b721..fc3b312 100644 --- a/group_vars/fsolgw.yml +++ b/group_vars/fsolgw.yml @@ -1,11 +1,10 @@ --- -network_carp_interfaces: +network_vip_interfaces: - device: vio3 vhid: 145 ipaddr: 37.16.96.145 netmask: 255.255.255.240 - pass: "{{ carp145_pass }}" - advskew: 128 + pass: "{{ vip145_pass }}" network_dns_servers: [172.20.20.10, 172.20.21.1, 172.20.21.2] # use custom firewall and ifstated config diff --git a/group_vars/gw.yml b/group_vars/gw.yml index 3a4b768..74153cf 100644 --- a/group_vars/gw.yml +++ b/group_vars/gw.yml @@ -1,17 +1,17 @@ --- -network_carp_interfaces: +network_vip_interfaces: - device: vio0 vhid: 1 ipaddr: 172.20.20.1 netmask: 255.255.252.0 - pass: "{{ carp1_pass }}" - advskew: 128 + pass: "{{ vip1_pass }}" + priority: 120 - device: vio0 vhid: 10 ipaddr: 172.20.20.10 netmask: 255.255.252.0 - pass: "{{ carp10_pass }}" - advskew: 128 + pass: "{{ vip10_pass }}" + priority: 120 network_ether_interfaces: - device: vio1 proto: none diff --git a/group_vars/ns.yml b/group_vars/ns.yml index f1436a9..7eab56d 100644 --- a/group_vars/ns.yml +++ b/group_vars/ns.yml @@ -9,12 +9,12 @@ firewall_in: - {proto: tcp, port: 4949, from: [172.20.20.0/22, 81.175.130.44/32]} ifstated_config: ifstated-ns.conf -network_carp_interfaces: +network_vip_interfaces: - device: vio1 vhid: 157 ipaddr: 37.16.96.157 netmask: 255.255.255.240 - pass: "{{ carp157_pass }}" + pass: "{{ vip157_pass }}" nsd_server: ns1.foo.sh nsd_zones: diff --git a/group_vars/proxy.yml b/group_vars/proxy.yml index cb37c52..03a91a2 100644 --- a/group_vars/proxy.yml +++ b/group_vars/proxy.yml @@ -10,35 +10,35 @@ network_dns_search: - foo.sh network_default_gateway: 37.16.96.145 -network_carp_interfaces: +network_vip_interfaces: - device: vio0 vhid: 8 ipaddr: 172.20.20.8 netmask: 255.255.252.0 - pass: "{{ carp8_pass }}" - advskew: "{{ carp8_advskew }}" + pass: "{{ vip8_pass }}" + priority: "{{ carp8_advskew }}" - device: vio0 vhid: 9 ipaddr: 172.20.20.9 netmask: 255.255.252.0 - pass: "{{ carp9_pass }}" - advskew: "{{ carp9_advskew }}" + pass: "{{ vip9_pass }}" + priority: "{{ carp9_advskew }}" - device: vio1 vhid: 153 ipaddr: 37.16.96.153 netmask: 255.255.255.240 ip6addr: 2a00:4cc1:6:1006:feed:dead:beef:153 ip6netmask: 64 - pass: "{{ carp153_pass }}" - advskew: "{{ carp153_advskew }}" + pass: "{{ vip153_pass }}" + priority: "{{ carp153_advskew }}" - device: vio1 vhid: 154 ipaddr: 37.16.96.154 netmask: 255.255.255.240 ip6addr: 2a00:4cc1:6:1006:feed:dead:beef:154 ip6netmask: 64 - pass: "{{ carp154_pass }}" - advskew: "{{ carp154_advskew }}" + pass: "{{ vip154_pass }}" + priority: "{{ carp154_advskew }}" ifstated_config: ifstated-proxy.conf diff --git a/host_vars/atl01.vultr.foo.sh.yml b/host_vars/atl01.vultr.foo.sh.yml index af4e516..9454e56 100644 --- a/host_vars/atl01.vultr.foo.sh.yml +++ b/host_vars/atl01.vultr.foo.sh.yml @@ -1,3 +1,3 @@ --- -network_carp_interfaces: [] +network_vip_interfaces: [] nsd_server: ns2.foo.sh diff --git a/host_vars/proxy01.home.foo.sh.yml b/host_vars/proxy01.home.foo.sh.yml index 1702821..1a69bbb 100644 --- a/host_vars/proxy01.home.foo.sh.yml +++ b/host_vars/proxy01.home.foo.sh.yml @@ -12,7 +12,7 @@ network_interfaces: proto: none # kludge advskew values for carps -carp8_advskew: 0 -carp9_advskew: 128 -carp153_advskew: 0 -carp154_advskew: 128 +vip8_priority: 240 +vip9_priority: 120 +vip153_priority: 240 +vip154_priority: 120 diff --git a/host_vars/proxy02.home.foo.sh.yml b/host_vars/proxy02.home.foo.sh.yml index 18c8b07..3fcf088 100644 --- a/host_vars/proxy02.home.foo.sh.yml +++ b/host_vars/proxy02.home.foo.sh.yml @@ -11,7 +11,7 @@ network_interfaces: vlan: 102 proto: none -carp8_advskew: 128 -carp9_advskew: 0 -carp153_advskew: 128 -carp154_advskew: 0 +vip8_priority: 120 +vip9_priority: 240 +vip153_priority: 120 +vip154_priority: 240