From fc36854fce10377e0d4e429d5a94c7e344e564d3 Mon Sep 17 00:00:00 2001
From: Michal Schmidt <mschmidt@redhat.com>
Date: Thu, 3 Sep 2015 17:24:28 +0200
Subject: [PATCH] openmpi-mca-params.conf: disable psm2 MTL by default

Workaround for:
https://bugzilla.redhat.com/show_bug.cgi?id=1259835
---
 opal/etc/openmpi-mca-params.conf | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/opal/etc/openmpi-mca-params.conf b/opal/etc/openmpi-mca-params.conf
index 7a1f92367a..36f5bcd833 100644
--- a/opal/etc/openmpi-mca-params.conf
+++ b/opal/etc/openmpi-mca-params.conf
@@ -56,3 +56,13 @@
 
 # See "ompi_info --param all all" for a full listing of Open MPI MCA
 # parameters available and their default values.
+
+# Disable the psm2 MTL by default.
+# Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1259835
+# This avoids a conflict between libpsm2.so.2 and libpsm_infinipath.so.1.
+mtl = ^psm2
+# If psm2 is needed, comment out the above line and uncomment
+# the following two lines. This will disable MCAs that are known to
+# depend on libpsm_infinipath.so.1:
+#   mtl = ^psm,ofi
+#   btl = ^usnic
-- 
2.4.3