From: David Galloway <dgallowa@redhat.com>
Date: Mon, 2 Oct 2017 19:10:04 +0000 (-0400)
Subject: testnode: Update dependencies for zap tasks
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F341%2Fhead;p=ceph-cm-ansible.git

testnode: Update dependencies for zap tasks

Signed-off-by: David Galloway <dgallowa@redhat.com>
---

diff --git a/roles/testnode/tasks/zap_disks.yml b/roles/testnode/tasks/zap_disks.yml
index 4686a97e..e893f5ed 100644
--- a/roles/testnode/tasks/zap_disks.yml
+++ b/roles/testnode/tasks/zap_disks.yml
@@ -1,8 +1,26 @@
 ---
-- name: Make sure gdisk is installed
-  package:
-    name: gdisk
+# These zap tasks are run on freshly reimaged cobbler_managed machines
+# even when using the -stock profiles.  Therefore, testnode package
+# installation hasn't happened yet so we install zap dependencies here.
+
+- name: Make sure apt dependencies are installed
+  apt:
+    name: "{{ item }}"
+    state: present
+  with_items:
+    - gdisk
+    - dmsetup
+  when: ansible_os_family == "Debian"
+
+- name: Make sure rpm dependencies are installed
+  yum:
+    name: "{{ item }}"
     state: present
+  with_items:
+    - gdisk
+    # for dmsetup
+    - device-mapper
+  when: ansible_os_family == "RedHat"
 
 - name: Set root disk
   set_fact: