Merge branch 'devel' into devel

control_plane/inifiniband.yml

@@ -11,11 +11,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
----
 
-- name: Infiniband Configuration
-  hosts: all
-  gather_facts: false
-  connection: local
-  roles:
-    - network_ib
+---
+-  name: Infiniband Configuration
+   hosts: all
+   gather_facts: false
+   connection: local
+   roles:
+    - network_ib

control_plane/roles/control_plane_sm/files/Dockerfile

@@ -6,7 +6,7 @@ RUN dnf install -y epel-release
 
 RUN dnf groupinstall "Infiniband Support" -y
 
-RUN dnf install -y opensm
+RUN dnf install -y opensm-3.3.23
 
 COPY opensm.conf /etc/rdma/opensm.conf
 

control_plane/roles/network_ib/tasks/disable_switch_sm.yml

@@ -0,0 +1,24 @@
+# Copyright 2021 Dell Inc. or its subsidiaries. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+---
+
+- name: Ensure Subnet Manager is disabled on switch
+  block:
+  - name: Set parameters to disable sm
+    set_fact:
+      sm_config: "no ib sm"
+
+  - name: Disable subnet manager on switch
+    include_tasks: global_config.yml
+    with_items: "{{ sm_config }}"

control_plane/roles/network_ib/tasks/main.yml

@@ -31,6 +31,9 @@
     - name: Configure SNMP
       include_tasks: snmp_config.yml
 
+    - name: Ensure SM is disabled on switch
+      include_tasks: disable_switch_sm.yml
+
     - name: Save running-config to startup-config
       include_tasks: save_config.yml