Merge pull request #1249 from rhc54/topic/pmixdflt

Do not override any external settings for PMIx component selection

orte/mca/ess/base/ess_base_std_orted.c

@@ -510,8 +510,9 @@ int orte_ess_base_orted_setup(char **hosts)
     /* obviously, we have "reported" */
     jdata->num_reported = 1;
 
-    /* setup the PMIx framework - ensure it skips all non-PMIx components */
-    putenv("OMPI_MCA_pmix=^s1,s2,cray");
+    /* setup the PMIx framework - ensure it skips all non-PMIx components,
+     * but do not override anything we were given */
+    opal_setenv("OMPI_MCA_pmix", "^s1,s2,cray", false, &environ);
     if (OPAL_SUCCESS != (ret = mca_base_framework_open(&opal_pmix_base_framework, 0))) {
         ORTE_ERROR_LOG(ret);
         error = "orte_pmix_base_open";

orte/mca/ess/hnp/ess_hnp_module.c

@@ -621,8 +621,9 @@ static int rte_init(void)
         free(contact_path);
     }
 
-    /* setup the PMIx framework - ensure it skips all non-PMIx components */
-    putenv("OMPI_MCA_pmix=^s1,s2,cray");
+    /* setup the PMIx framework - ensure it skips all non-PMIx components, but
+     * do not override anything we were given */
+    opal_setenv("OMPI_MCA_pmix", "^s1,s2,cray", false, &environ);
     if (OPAL_SUCCESS != (ret = mca_base_framework_open(&opal_pmix_base_framework, 0))) {
         ORTE_ERROR_LOG(ret);
         error = "orte_pmix_base_open";

orte/mca/schizo/ompi/schizo_ompi.c

@@ -425,8 +425,9 @@ static int setup_fork(orte_job_t *jdata,
      */
     opal_setenv("OMPI_MCA_ess", "^singleton", false, &app->env);
 
-    /* ensure that the spawned process ignores direct launch components */
-    opal_setenv("OMPI_MCA_pmix", "^s1,s2,cray", true, &app->env);
+    /* ensure that the spawned process ignores direct launch components,
+     * but do not overrride anything we were given */
+    opal_setenv("OMPI_MCA_pmix", "^s1,s2,cray", false, &app->env);
 
     /* since we want to pass the name as separate components, make sure
      * that the "name" environmental variable is cleared!