From c9506decd6345b59d190cf983fb522f62dbba7dd Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Wed, 11 Jul 2012 14:48:56 -0700
Subject: [PATCH] switch/nrt: treat --network=ip the same as --network=ipv4
---
doc/html/poe.shtml | 1 +
src/plugins/switch/nrt/switch_nrt.c | 2 ++
2 files changed, 3 insertions(+)
diff --git a/doc/html/poe.shtml b/doc/html/poe.shtml
index bc6cee24e1c..b6053aeb825 100644
--- a/doc/html/poe.shtml
+++ b/doc/html/poe.shtml
@@ -44,6 +44,7 @@ SLURM_NETWORK environment variable. Supported network options include:</p>
<ul>
<li>Network protocol</li>
<ul>
+ <li><b>ip</b> Internet protocol, version 4</li>
<li><b>ipv4</b> Internet protocol, version 4 (default)</li>
<li><b>ipv6</b> Internet protocol, version 6</li>
<li><b>us</b> User Space protocol, may be combined with ibv4 or ipv6</li>
diff --git a/src/plugins/switch/nrt/switch_nrt.c b/src/plugins/switch/nrt/switch_nrt.c
index a80e4d27898..c717f99ce99 100644
--- a/src/plugins/switch/nrt/switch_nrt.c
+++ b/src/plugins/switch/nrt/switch_nrt.c
@@ -498,6 +498,8 @@ extern int switch_p_build_jobinfo(switch_jobinfo_t *switch_job, char *nodelist,
}
/* network options */
+ } else if (!strcasecmp(token, "ip")) {
+ ip_v4 = true;
} else if (!strcasecmp(token, "ipv4")) {
ip_v4 = true;
} else if (!strcasecmp(token, "ipv6")) {
--
GitLab