summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-09-21 20:31:06 +0200
committerChristian Poessinger <christian@poessinger.com>2021-09-21 21:35:04 +0200
commit761631d662ccc18827d017d197c0e0100ac36219 (patch)
treecdfe8a4cc633b6f9685392d6b4026b1c06d9a424 /data
parent590cf0e626f6a5e813ec4f3021c028a5e098e27d (diff)
downloadvyos-1x-761631d662ccc18827d017d197c0e0100ac36219.tar.gz
vyos-1x-761631d662ccc18827d017d197c0e0100ac36219.zip
vrrp: keepalived: T3847: migrate to get_config_dict()
Diffstat (limited to 'data')
-rw-r--r--data/templates/vrrp/daemon.tmpl5
-rw-r--r--data/templates/vrrp/keepalived.conf.tmpl121
2 files changed, 64 insertions, 62 deletions
diff --git a/data/templates/vrrp/daemon.tmpl b/data/templates/vrrp/daemon.tmpl
deleted file mode 100644
index c9dbea72d..000000000
--- a/data/templates/vrrp/daemon.tmpl
+++ /dev/null
@@ -1,5 +0,0 @@
-# Autogenerated by VyOS
-# Options to pass to keepalived
-
-# DAEMON_ARGS are appended to the keepalived command-line
-DAEMON_ARGS="--snmp"
diff --git a/data/templates/vrrp/keepalived.conf.tmpl b/data/templates/vrrp/keepalived.conf.tmpl
index 3696c8395..a1e47abc3 100644
--- a/data/templates/vrrp/keepalived.conf.tmpl
+++ b/data/templates/vrrp/keepalived.conf.tmpl
@@ -12,85 +12,92 @@ global_defs {
notify_fifo_script /usr/libexec/vyos/system/keepalived-fifo.py
}
-{% for group in groups %}
-{% if group.health_check_script is defined and group.health_check_script is not none %}
-vrrp_script healthcheck_{{ group.name }} {
- script "{{ group.health_check_script }}"
- interval {{ group.health_check_interval }}
- fall {{ group.health_check_count }}
+{% if group is defined and group is not none %}
+{% for name, group_config in group.items() if group_config.disable is not defined %}
+{% if group_config.health_check is defined and group_config.health_check.script is defined and group_config.health_check.script is not none %}
+vrrp_script healthcheck_{{ name }} {
+ script "{{ group_config.health_check.script }}"
+ interval {{ group_config.health_check.interval }}
+ fall {{ group_config.health_check.failure_count }}
rise 1
}
-{% endif %}
-
-vrrp_instance {{ group.name }} {
- {{ '# ' ~ group.description if group.description is defined }}
+{% endif %}
+vrrp_instance {{ name }} {
+ {{ '# ' ~ group_config.description if group_config.description is defined }}
state BACKUP
- interface {{ group.interface }}
- virtual_router_id {{ group.vrid }}
- priority {{ group.priority }}
- advert_int {{ group.advertise_interval }}
-{% if group.preempt is defined and group.preempt is not none %}
- preempt_delay {{ group.preempt_delay }}
-{% else %}
+ interface {{ group_config.interface }}
+ virtual_router_id {{ group_config.vrid }}
+ priority {{ group_config.priority }}
+ advert_int {{ group_config.advertise_interval }}
+{% if group_config.no_preempt is not defined and group_config.preempt_delay is defined and group_config.preempt_delay is not none %}
+ preempt_delay {{ group_config.preempt_delay }}
+{% elif group_config.no_preempt is defined %}
nopreempt
-{% endif %}
-{% if group.peer_address is defined and group.peer_address is not none %}
- unicast_peer { {{ group.peer_address }} }
-{% endif %}
-{% if group.hello_source is defined and group.hello_source is not none %}
-{% if group.peer_address is defined and group.peer_address is not none %}
- unicast_src_ip {{ group.hello_source }}
-{% else %}
- mcast_src_ip {{ group.hello_source }}
{% endif %}
-{% endif %}
-{% if group.use_vmac is defined and group.peer_address is defined %}
- use_vmac {{ group.interface }}v{{ group.vrid }}
+{% if group_config.peer_address is defined and group_config.peer_address is not none %}
+ unicast_peer { {{ group_config.peer_address }} }
+{% endif %}
+{% if group_config.hello_source_address is defined and group_config.hello_source_address is not none %}
+{% if group_config.peer_address is defined and group_config.peer_address is not none %}
+ unicast_src_ip {{ group_config.hello_source_address }}
+{% else %}
+ mcast_src_ip {{ group_config.hello_source_address }}
+{% endif %}
+{% endif %}
+{% if group_config.rfc3768_compatibility is defined and group_config.peer_address is defined %}
+ use_vmac {{ group_config.interface }}v{{ group_config.vrid }}
vmac_xmit_base
-{% elif group.use_vmac is defined %}
- use_vmac {{ group.interface }}v{{ group.vrid }}
-{% endif %}
-{% if group.auth_password is defined and group.auth_password is not none %}
+{% elif group_config.rfc3768_compatibility is defined %}
+ use_vmac {{ group_config.interface }}v{{ group_config.vrid }}
+{% endif %}
+{% if group_config.authentication is defined and group_config.authentication is not none %}
authentication {
- auth_pass "{{ group.auth_password }}"
- auth_type {{ group.auth_type }}
+ auth_pass "{{ group_config.authentication.password }}"
+{% if group_config.authentication.type == 'plaintext-password' %}
+ auth_type PASS
+{% else %}
+ auth_type {{ group_config.authentication.type | upper }}
+{% endif %}
}
-{% endif %}
-{% if group.virtual_addresses is defined and group.virtual_addresses is not none %}
+{% endif %}
+{% if group_config.virtual_address is defined and group_config.virtual_address is not none %}
virtual_ipaddress {
-{% for addr in group.virtual_addresses %}
+{% for addr in group_config.virtual_address %}
{{ addr }}
-{% endfor %}
+{% endfor %}
}
-{% endif %}
-{% if group.virtual_addresses_excluded is defined and group.virtual_addresses_excluded is not none %}
+{% endif %}
+{% if group_config.virtual_address_excluded is defined and group_config.virtual_address_excluded is not none %}
virtual_ipaddress_excluded {
-{% for addr in group.virtual_addresses_excluded %}
+{% for addr in group_config.virtual_address_excluded %}
{{ addr }}
-{% endfor %}
+{% endfor %}
}
-{% endif %}
-{% if group.health_check_script is defined and group.health_check_script is not none %}
+{% endif %}
+{% if group_config.health_check is defined and group_config.health_check.script is defined and group_config.health_check.script is not none %}
track_script {
- healthcheck_{{ group.name }}
+ healthcheck_{{ name }}
}
-{% endif %}
+{% endif %}
}
-{% endfor %}
+{% endfor %}
+{% endif %}
-{% if sync_groups is defined and sync_groups is not none %}
-{% for sync_group in sync_groups %}
-vrrp_sync_group {{ sync_group.name }} {
+{% if sync_group is defined and sync_group is not none %}
+{% for name, group_config in sync_group.items() if group_config.disable is not defined %}
+vrrp_sync_group {{ name }} {
group {
-{% for member in sync_group.members %}
+{% if group_config.member is defined and group_config.member is not none %}
+{% for member in group_config.member %}
{{ member }}
-{% endfor %}
+{% endfor %}
+{% endif %}
}
-{% if sync_group.conntrack_sync %}
+{% if conntrack_sync_group is defined and conntrack_sync_group == name %}
{% set vyos_helper = "/usr/libexec/vyos/vyos-vrrp-conntracksync.sh" %}
- notify_master "{{ vyos_helper }} master {{ sync_group.name }}"
- notify_backup "{{ vyos_helper }} backup {{ sync_group.name }}"
- notify_fault "{{ vyos_helper }} fault {{ sync_group.name }}"
+ notify_master "{{ vyos_helper }} master {{ name }}"
+ notify_backup "{{ vyos_helper }} backup {{ name }}"
+ notify_fault "{{ vyos_helper }} fault {{ name }}"
{% endif %}
}
{% endfor %}