summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/templates/monitoring/telegraf.tmpl2
-rw-r--r--data/templates/vrrp/keepalived.conf.tmpl5
2 files changed, 6 insertions, 1 deletions
diff --git a/data/templates/monitoring/telegraf.tmpl b/data/templates/monitoring/telegraf.tmpl
index c5cbddc8c..5b9838f7b 100644
--- a/data/templates/monitoring/telegraf.tmpl
+++ b/data/templates/monitoring/telegraf.tmpl
@@ -12,7 +12,7 @@
debug = false
quiet = false
logfile = ""
- hostname = ""
+ hostname = "{{ hostname }}"
omit_hostname = false
{% if influxdb_configured is defined %}
[[outputs.influxdb_v2]]
diff --git a/data/templates/vrrp/keepalived.conf.tmpl b/data/templates/vrrp/keepalived.conf.tmpl
index 10d5c6d24..6203184e3 100644
--- a/data/templates/vrrp/keepalived.conf.tmpl
+++ b/data/templates/vrrp/keepalived.conf.tmpl
@@ -5,6 +5,11 @@
global_defs {
dynamic_interfaces
script_user root
+{% if global_parameters is defined and global_parameters is not none %}
+{% if global_parameters.startup_delay is defined %}
+ vrrp_startup_delay {{ global_parameters.startup_delay }}
+{% endif %}
+{% endif %}
notify_fifo /run/keepalived/keepalived_notify_fifo
notify_fifo_script /usr/libexec/vyos/system/keepalived-fifo.py
}