summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/templates/salt-minion/minion.j22
-rw-r--r--interface-definitions/salt-minion.xml.in4
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>