diff --git a/group_vars/proxy.yml b/group_vars/proxy.yml index c1a9bf0..9f8eeb2 100644 --- a/group_vars/proxy.yml +++ b/group_vars/proxy.yml @@ -40,8 +40,6 @@ network_vip_interfaces: pass: "{{ vip154_pass }}" priority: "{{ vip154_priority }}" -ifstated_config: ifstated-proxy.conf - firewall_raw: - pass quick proto carp firewall_in: diff --git a/roles/ifstated/defaults/main.yml b/roles/ifstated/defaults/main.yml new file mode 100644 index 0000000..8f10239 --- /dev/null +++ b/roles/ifstated/defaults/main.yml @@ -0,0 +1,2 @@ +--- +ifstated_config: ifstated.conf.j2 diff --git a/roles/ifstated/templates/ifstated-proxy.conf b/roles/ifstated/templates/ifstated.conf.j2 similarity index 51% rename from roles/ifstated/templates/ifstated-proxy.conf rename to roles/ifstated/templates/ifstated.conf.j2 index b847be4..b3e4b42 100644 --- a/roles/ifstated/templates/ifstated-proxy.conf +++ b/roles/ifstated/templates/ifstated.conf.j2 @@ -1,6 +1,4 @@ # flush routes when external carp goes up -if carp153.link.up - run 'route -q flush ; route add default $(cat /etc/mygate)' -if carp154.link.up +if carp*.link.up run 'route -q flush ; route add default $(cat /etc/mygate)'