diff --git a/defaults/main.yml b/defaults/main.yml
index 8b4d6c0..9506612 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -15,7 +15,6 @@ rdma_packages:
  - infiniband-diags
  - pciutils
  - perftest
- - opensm
  - qperf
 
 # Mutually exclusive:
diff --git a/tasks/redhat.yml b/tasks/redhat.yml
index e1e48e4..e4a9d58 100644
--- a/tasks/redhat.yml
+++ b/tasks/redhat.yml
@@ -10,15 +10,13 @@
 
 - name: install rdma
   package:
-    name: "{{ item }}"
+    name: "{{ rdma_core_packages }}"
     state: present
-  with_items: "{{ rdma_core_packages }}"
 
 - name: install extra rdma packages
   package:
-    pkg: "{{ item }}"
+    name: "{{ rdma_packages }}"
     state: present
-  with_items: "{{ rdma_packages }}"
 
 - name: add infiniband udev rules
   template:
@@ -113,6 +111,12 @@
     - ansible_connection == 'chroot'
     - rdma_manage_rdma|bool
 
+- name: Make sure opensm is installed if ansible manages it
+  package:
+    name: opensm
+    state: present
+  when: rdma_manage_opensm|bool
+
 - name: Generate the OpenSM partition configuration file
   template:
     src: partitions.conf.j2