summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgrakiss <grakiss.wanglei@huawei.com>2015-10-13 11:16:09 +0800
committergrakiss <grakiss.wanglei@huawei.com>2015-10-13 11:19:37 +0800
commit9b3c94d6da0e9d652b6019f437a90d9a61669fe9 (patch)
tree5576c94047612a4990cd466eb184add4ec84c2db
parent2cbacbc060805b446769def612253798f3b7fb03 (diff)
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>
-rw-r--r--deploy/adapters/ansible/roles/ceph-deploy/files/create_osd.sh3
1 files changed, 1 insertions, 2 deletions
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