Merge pull request #5312 from karasevb/3.0_fix_pmix_component

v3.0.x: pmix/ext2x: fixed detection PMIx v2.0 by pmix component

Author: bwbarrett

opal/mca/pmix/ext2x/pmix2x_component.c

@@ -100,6 +100,7 @@ static int external_component_query(mca_base_module_t **module, int *priority)
 
     /* see if a PMIx server is present */
     if (NULL != (t = getenv("PMIX_SERVER_URI")) ||
+        NULL != (t = getenv("PMIX_SERVER_URI2")) ||
         NULL != (id = getenv("PMIX_ID"))) {
         /* if PMIx is present, then we are a client and need to use it */
         *priority = 100;

opal/mca/pmix/pmix2x/pmix2x_component.c

@@ -117,6 +117,7 @@ static int external_component_query(mca_base_module_t **module, int *priority)
 
     /* see if a PMIx server is present */
     if (NULL != (t = getenv("PMIX_SERVER_URI")) ||
+        NULL != (t = getenv("PMIX_SERVER_URI2")) ||
         NULL != (id = getenv("PMIX_ID"))) {
         /* if PMIx is present, then we are a client and need to use it */
         *priority = 100;