From 2d097f9cdb5a89ef4aba34958201cdc68756ae4f Mon Sep 17 00:00:00 2001
From: Vladimir Kuklin <vkuklin@mirantis.com>
Date: Fri, 26 Dec 2014 14:20:19 +0000
Subject: [PATCH] Revert "Remove 'ceph-deploy osd activate'"

This commit should not have been merged into stable/6.0 branch before 6.0 release.

Related-bug: #1374160

This reverts commit fb5837947c25ab76d03b8bb7f666e59719fa0165.

Change-Id: Ia60cc52320dcbc48fbe1b25d7b867f20f20b4347
---
 deployment/puppet/ceph/manifests/osd.pp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/deployment/puppet/ceph/manifests/osd.pp b/deployment/puppet/ceph/manifests/osd.pp
index ca149496b2..50f0ba1133 100644
--- a/deployment/puppet/ceph/manifests/osd.pp
+++ b/deployment/puppet/ceph/manifests/osd.pp
@@ -26,6 +26,13 @@ class ceph::osd (
     unless    => "grep -q '^${ $::ceph::osd_devices[0] }' /proc/mounts",
   }
 
+  exec { 'ceph-deploy osd activate':
+    command   => "ceph-deploy osd activate ${devices}",
+    returns   => 0,
+    logoutput => true,
+  }
+
   Firewall['011 ceph-osd allow'] ->
-  Exec['ceph-deploy osd prepare']
+  Exec['ceph-deploy osd prepare'] ->
+  Exec['ceph-deploy osd activate']
 }