ras/gridengine: Fix !orte_keep_fqdn_hostnames for GridEngine

Signed-off-by: Joshua Hursey <[email protected]>

Author: jjhursey

orte/mca/ras/gridengine/ras_gridengine_module.c

@@ -10,6 +10,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2006-2010 Oracle and/or its affiliates.  All rights reserved
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -28,6 +29,7 @@
 #include <string.h>
 
 #include "opal/util/output.h"
+#include "opal/util/net.h"
 #include "orte/util/show_help.h"
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/runtime/orte_globals.h"
@@ -62,7 +64,7 @@ static int orte_ras_gridengine_allocate(orte_job_t *jdata, opal_list_t *nodelist
 {
     char *pe_hostfile = getenv("PE_HOSTFILE");
     char *job_id = getenv("JOB_ID");
-    char buf[1024], *tok, *num, *queue, *arch, *ptr;
+    char buf[1024], *tok, *num, *queue, *arch, *ptr, *tmp;
     int rc;
     FILE *fp;
     orte_node_t *node;
@@ -96,6 +98,12 @@ static int orte_ras_gridengine_allocate(orte_job_t *jdata, opal_list_t *nodelist
         queue = strtok_r(NULL, " \n", &tok);
         arch = strtok_r(NULL, " \n", &tok);
 
+        if( !orte_keep_fqdn_hostnames && !opal_net_isaddr(ptr) ) {
+            if (NULL != (tmp = strchr(ptr, '.'))) {
+                *tmp = '\0';
+            }
+        }
+
         /* see if we already have this node */
         found = false;
         for (item = opal_list_get_first(nodelist);