From 3e7ba372902a21d0596b5abe99824754940e19b0 Mon Sep 17 00:00:00 2001
From: Matthew Heler <matthew.heler@hotmail.com>
Date: Mon, 29 Oct 2018 10:10:15 -0500
Subject: [PATCH] Ensure latest Ceph packages during deployment

Change-Id: Ia5bc0802577e2b72a1de078085f5fe7e60f63604
---
 .../tasks/support-packages.yaml               | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/tools/images/kubeadm-aio/assets/opt/playbooks/roles/deploy-kubelet/tasks/support-packages.yaml b/tools/images/kubeadm-aio/assets/opt/playbooks/roles/deploy-kubelet/tasks/support-packages.yaml
index 16884f52b..501c70fed 100644
--- a/tools/images/kubeadm-aio/assets/opt/playbooks/roles/deploy-kubelet/tasks/support-packages.yaml
+++ b/tools/images/kubeadm-aio/assets/opt/playbooks/roles/deploy-kubelet/tasks/support-packages.yaml
@@ -61,22 +61,29 @@
   with_items:
     - libselinux-python
 
-- when: kubelet.pv_support_ceph
-  name: installing ceph support packages
-  include_role:
-    name: deploy-package
-    tasks_from: dist
-  vars:
-    packages:
-      deb:
-        - ceph-common
-        - rbd-nbd
-      rpm:
+- name: installing ceph support packages
+  when: kubelet.pv_support_ceph
+  block:
+  - name: ubuntu | installing packages
+    when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
+    apt:
+      name: "{{item}}"
+      state: latest
+    with_items:
         - ceph-common
         - rbd-nbd
 
-- when: kubelet.pv_support_ceph
-  name: blacklist kernel RBD driver module
+  - name: centos | installing packages
+    when: ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux'
+    yum:
+      name: "{{item}}"
+      state: latest
+    with_items:
+        - ceph-common
+        - rbd-nbd
+
+- name: blacklist kernel RBD driver module
+  when: kubelet.pv_support_ceph
   copy:
     dest: "/etc/modprobe.d/rbd.conf"
     content: "install rbd /bin/true"