diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-04-15 21:07:50 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2022-04-15 21:08:01 +0200 |
| commit | 0b56514eb00864c8d69a02c2ab307f3877623d8a (patch) | |
| tree | a2fa7699ea98f3999655fbc34c877c77ac0189d9 | |
| parent | ebb8181567cbb25ae059f7efa30c61be067dbd9d (diff) | |
| download | vyos-1x-0b56514eb00864c8d69a02c2ab307f3877623d8a.tar.gz vyos-1x-0b56514eb00864c8d69a02c2ab307f3877623d8a.zip | |
salt-minion: T4364: support IPv6 master server(s)
| -rw-r--r-- | data/templates/salt-minion/minion.j2 | 2 | ||||
| -rw-r--r-- | interface-definitions/salt-minion.xml.in | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/data/templates/salt-minion/minion.j2 b/data/templates/salt-minion/minion.j2 index 7e7ac5885..d9922ebe8 100644 --- a/data/templates/salt-minion/minion.j2 +++ b/data/templates/salt-minion/minion.j2 @@ -38,7 +38,7 @@ log_level: warning # resolved, then the minion will fail to start. master: {% for host in master %} - - {{ host }} + - {{ host | bracketize_ipv6 }} {% endfor %} # The user to run salt diff --git a/interface-definitions/salt-minion.xml.in b/interface-definitions/salt-minion.xml.in index 9425d2b7f..f8b4c4b89 100644 --- a/interface-definitions/salt-minion.xml.in +++ b/interface-definitions/salt-minion.xml.in @@ -28,6 +28,10 @@ <description>Salt server IPv4 address</description> </valueHelp> <valueHelp> + <format>ipv6</format> + <description>Salt server IPv6 address</description> + </valueHelp> + <valueHelp> <format>hostname</format> <description>Salt server FQDN address</description> </valueHelp> |