diff options
| author | khramshinr <khramshinr@gmail.com> | 2024-03-01 12:39:28 +0800 |
|---|---|---|
| committer | khramshinr <khramshinr@gmail.com> | 2024-03-01 12:39:28 +0800 |
| commit | ef5c61b26e60a85768a0c6c0677e38fc238d1c29 (patch) | |
| tree | 20b0307dd283c84eca8a32d4b7ab220b69704e6b /data | |
| parent | 2943d9bb0f65fb9c1a605b9c1906c25ae827a656 (diff) | |
| parent | c095867d873a9a7dde038bb751ba26edc66b99f7 (diff) | |
| download | vyos-1x-ef5c61b26e60a85768a0c6c0677e38fc238d1c29.tar.gz vyos-1x-ef5c61b26e60a85768a0c6c0677e38fc238d1c29.zip | |
vrrp: T6020: vrrp health-check script not applied correctly in keepalived.conf
Added health-check to sync-group in CLI
Don't use instance health-check when instance in sync group member
Disallow wrong healtch-check configurations
New smoke test
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/high-availability/keepalived.conf.j2 | 6 | ||||
| -rw-r--r-- | data/templates/login/default_motd.j2 | 14 | ||||
| -rw-r--r-- | data/templates/vyos-hostsd/hosts.j2 | 1 |
3 files changed, 20 insertions, 1 deletions
diff --git a/data/templates/high-availability/keepalived.conf.j2 b/data/templates/high-availability/keepalived.conf.j2 index 50b910ca3..240161748 100644 --- a/data/templates/high-availability/keepalived.conf.j2 +++ b/data/templates/high-availability/keepalived.conf.j2 @@ -100,7 +100,11 @@ vrrp_instance {{ name }} { nopreempt {% endif %} {% if group_config.peer_address is vyos_defined %} - unicast_peer { {{ group_config.peer_address }} } + unicast_peer { +{% for peer_address in group_config.peer_address %} + {{ peer_address }} +{% endfor %} + } {% endif %} {% if group_config.hello_source_address is vyos_defined %} {% if group_config.peer_address is vyos_defined %} diff --git a/data/templates/login/default_motd.j2 b/data/templates/login/default_motd.j2 new file mode 100644 index 000000000..8584d261a --- /dev/null +++ b/data/templates/login/default_motd.j2 @@ -0,0 +1,14 @@ +Welcome to VyOS! + + ┌── ┐ + . VyOS {{ version_data.version }} + └ ──┘ {{ version_data.release_train }} + + * Documentation: https://docs.vyos.io/en/{{ version_data.release_train | replace('current', 'latest') }} + * Project news: https://blog.vyos.io + * Bug reports: https://vyos.dev + +You can change this banner using "set system login banner post-login" command. + +VyOS is a free software distribution that includes multiple components, +you can check individual component licenses under /usr/share/doc/*/copyright diff --git a/data/templates/vyos-hostsd/hosts.j2 b/data/templates/vyos-hostsd/hosts.j2 index 71fa335da..62ecf3ad0 100644 --- a/data/templates/vyos-hostsd/hosts.j2 +++ b/data/templates/vyos-hostsd/hosts.j2 @@ -4,6 +4,7 @@ # Local host 127.0.0.1 localhost +127.0.1.1 {{ host_name }} # The following lines are desirable for IPv6 capable hosts ::1 localhost ip6-localhost ip6-loopback |