From b69ff7053d4eeb3b835ab3e06a870e9e0a25320b Mon Sep 17 00:00:00 2001
From: Tim McMullan <mcmullan@schedmd.com>
Date: Mon, 9 Nov 2020 12:14:35 -0500
Subject: [PATCH] Docs - Suggest enabling IPv6 in slurm.conf and slurmdbd.conf

Suggest that if enabling IPv6 in one place that you should enable
it in both config files to prevent potential issues.

Bug 10133
---
 doc/man/man5/slurm.conf.5    | 5 +++--
 doc/man/man5/slurmdbd.conf.5 | 8 +++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index 55ea8e2ae07..b58d9508483 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -476,12 +476,13 @@ to see if the system is quiescing when sending a message, and if so, we wait
 until it is done before sending.
 .TP
 \fBDisableIPv4\fR
-Disable IPv4 only operation for all slurm daemons (except slurmdbd).
+Disable IPv4 only operation for all slurm daemons (except slurmdbd). This
+should also be set in your \fBslurmdbd.conf\fR file.
 .TP
 \fBEnableIPv6\fR
 Enable using IPv6 addresses for all slurm daemons (except slurmdbd). When
 using both IPv4 and IPv6, address family preferences will be based on your
-/etc/gai.conf file.
+/etc/gai.conf file. This should also be set in your \fBslurmdbd.conf\fR file.
 .TP
 \fBNoAddrCache\fR
 By default, Slurm will cache a node's network address after successfully
diff --git a/doc/man/man5/slurmdbd.conf.5 b/doc/man/man5/slurmdbd.conf.5
index 3bde27ef89c..2ff9d83a5cd 100644
--- a/doc/man/man5/slurmdbd.conf.5
+++ b/doc/man/man5/slurmdbd.conf.5
@@ -1,4 +1,4 @@
-.TH "slurmdbd.conf" "5" "Slurm Configuration File" "October 2020" "Slurm Configuration File"
+.TH "slurmdbd.conf" "5" "Slurm Configuration File" "November 2020" "Slurm Configuration File"
 
 .SH "NAME"
 slurmdbd.conf \- Slurm Database Daemon (SlurmDBD) configuration file
@@ -177,11 +177,13 @@ Comma separated options identifying communication options.
 .RS
 .TP 15
 \fBDisableIPv4\fR
-Disable IPv4 only operation for the slurmdbd.
+Disable IPv4 only operation for the slurmdbd. This should also be set in your
+\fBslurm.conf\fR file.
 .TP
 \fBEnableIPv6\fR
 Enable using IPv6 addresses for the slurmdbd. When using both IPv4 and IPv6,
-address family preferences will be based on your /etc/gai.conf file.
+address family preferences will be based on your /etc/gai.conf file. This
+should also be set in your \fBslurm.conf\fR file.
 .RE
 
 .TP
-- 
GitLab