ras/slurm: Fix !orte_keep_fqdn_hostnames for Slurm

Signed-off-by: Joshua Hursey <[email protected]>
(cherry picked from commit ed5268a)
Signed-off-by: Joshua Hursey <[email protected]>

Author: jjhursey

orte/mca/ras/slurm/ras_slurm_module.c

@@ -15,6 +15,7 @@
  * Copyright (c) 2013-2014 Intel, Inc. All rights reserved.
  * Copyright (c) 2015      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -405,6 +406,7 @@ static int orte_ras_slurm_discover(char *regexp, char *tasks_per_node,
     int *slots;
     bool found_range = false;
     bool more_to_come = false;
+    char *ptr;
 
     orig = base = strdup(regexp);
     if (NULL == base) {
@@ -568,6 +570,12 @@ static int orte_ras_slurm_discover(char *regexp, char *tasks_per_node,
     for (i = 0; NULL != names && NULL != names[i]; ++i) {
         orte_node_t *node;
 
+        if( !orte_keep_fqdn_hostnames && !opal_net_isaddr(names[i]) ) {
+            if (NULL != (ptr = strchr(names[i], '.'))) {
+                *ptr = '\0';
+            }
+        }
+
         OPAL_OUTPUT_VERBOSE((1, orte_ras_base_framework.framework_output,
                              "%s ras:slurm:allocate:discover: adding node %s (%d slot%s)",
                              ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),