From: grakiss <grakiss.wanglei@huawei.com>
Date: Tue, 13 Oct 2015 03:16:09 +0000 (+0800)
Subject: fix failure on osd preparation
X-Git-Tag: brahmaputra.1.0~198^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9b3c94d6da0e9d652b6019f437a90d9a61669fe9;p=compass4nfv.git

fix failure on osd preparation

JIRA: COMPASS-90
  - force delete /ceph/images/ceph-volumes.img
  - prevent from kill create_osd.sh itself

Change-Id: I1e525bdf66809f93a4a1d5eff053d875145f99c4
Signed-off-by: grakiss <grakiss.wanglei@huawei.com>
---

diff --git a/deploy/adapters/ansible/roles/ceph-deploy/files/create_osd.sh b/deploy/adapters/ansible/roles/ceph-deploy/files/create_osd.sh
index b5c9da3b..0715e81c 100644
--- a/deploy/adapters/ansible/roles/ceph-deploy/files/create_osd.sh
+++ b/deploy/adapters/ansible/roles/ceph-deploy/files/create_osd.sh
@@ -9,7 +9,7 @@ if [ ! -d "/ceph/images" ]; then
 mkdir -p /ceph/images
 fi
 
-rm /ceph/images/ceph-volumes.img
+rm -f /ceph/images/ceph-volumes.img
 
 if [ ! -f "/ceph/images/ceph-volumes.img" ]; then
 echo "create ceph-volumes.img"
@@ -18,7 +18,6 @@ sgdisk -g --clear /ceph/images/ceph-volumes.img
 fi
 
 #safe check
-ps -ef |grep create_osd.sh |awk '{print $2}' |xargs kill -9
 ps -ef |grep lvremove |awk '{print $2}' |xargs kill -9
 ps -ef |grep vgremove |awk '{print $2}' |xargs kill -9
 ps -ef |grep vgcreate |awk '{print $2}' |xargs kill -9