aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2015-10-13 11:36:36 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-10-13 11:36:36 +0000
commit81ff26c74d43cc45bd8357685f58559d34655560 (patch)
tree97276cb7181a7e4c485a10c449faaa49752de5ad /deploy/adapters/ansible/roles
parent6491a717abcdf51d0e3210914b10fdaafe9eecc4 (diff)
parent9b3c94d6da0e9d652b6019f437a90d9a61669fe9 (diff)
Merge "fix failure on osd preparation"
Diffstat (limited to 'deploy/adapters/ansible/roles')
-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