when using loop files for cinder volumes, the file size must be 512-byte alignment

JIRA: COMPASS-145

Change-Id: I7aa08eba8856e5ada65a6a71d5a10452cac564c3
Signed-off-by: carey.xu <carey.xuhan@huawei.com>

diff --git a/deploy/adapters/ansible/roles/cinder-volume/files/create_img.sh b/deploy/adapters/ansible/roles/cinder-volume/files/create_img.sh
index b69db0e..2e73418 100644 (file)
--- a/deploy/adapters/ansible/roles/cinder-volume/files/create_img.sh
+++ b/deploy/adapters/ansible/roles/cinder-volume/files/create_img.sh
@@ -1,3 +1,3 @@
 if [[ ! -f /var/cinder.img ]]; then
-  dd if=/dev/zero of=/var/cinder.img bs=1 count=1 seek=$1
+  dd if=/dev/zero of=/var/cinder.img bs=1 count=0 seek=$1
 fi

diff --git a/deploy/adapters/ansible/roles/cinder-volume/files/get_var_size.sh b/deploy/adapters/ansible/roles/cinder-volume/files/get_var_size.sh
index 9670da1..55041c6 100644 (file)
--- a/deploy/adapters/ansible/roles/cinder-volume/files/get_var_size.sh
+++ b/deploy/adapters/ansible/roles/cinder-volume/files/get_var_size.sh
@@ -2,5 +2,5 @@ size=`df /var | awk '$3 ~ /[0-9]+/ { print $4 }'`;
 if [[ $size -gt 2000000000 ]]; then
   echo -n 2000000000000;
 else
-  echo -n $((size * 1000));
+  echo -n $((size * 1000 / 512 * 512));
 fi