Fix incorrect filename for final copy

sabre1041 · Apr 30, 2017 · 415c139 · 415c139
1 parent 57fff13
commit 415c139
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/setup-kvm-and-openstack/build-rhosp-vm.sh b/setup-kvm-and-openstack/build-rhosp-vm.sh
@@ -137,7 +137,7 @@ fi
 
 # Sparsify image
 cmd virt-sparsify ${OSP_VM_IMAGE_PATH} ${OSP_VM_IMAGE_PATH}-sparsified
-cmd rsync -avP ${OSP_VM_IMAGE_PATH} ${FILESHARE_DEST_BASE}/${OSP_VM_NAME}/${OSP_VM_IMAGE_NAME}.${DATETIME}-sparsified
+cmd rsync -avP ${OSP_VM_IMAGE_PATH}-sparsified ${FILESHARE_DEST_BASE}/${OSP_VM_NAME}/${OSP_VM_IMAGE_NAME}.${DATETIME}-sparsified
 
 # Create symlink to new image
 pushd ${FILESHARE_DEST_BASE}/${OSP_VM_NAME}/
@@ -146,3 +146,4 @@ popd
 
 # Remove running rhosp guest
 source remove-rhosp-vm.sh
+cmd rm -iv ${OSP_VM_IMAGE_PATH}-sparsified
diff --git a/setup-kvm-and-openstack/openstack-scripts/openstack-env-config.sh b/setup-kvm-and-openstack/openstack-scripts/openstack-env-config.sh
@@ -161,7 +161,7 @@ create-images() {
       image-base-src
   fi
 	# wait for image to become active
-	echo -en "\nWaiting for image to create"
+	echo -en "\nWaiting for image-base-src image to create"
   counter=0
 	while :
 	do
@@ -196,13 +196,13 @@ create-images() {
       --property hw_disk_bus=scsi \
       --min-disk 10 \
       ${OPENSHIFT_VM_NAME}
-    echo -en "\nWaiting for volume to create"
+    echo -en "\nWaiting for ${OPENSHIFT_VM_NAME} volume to create"
     counter=0
     while :
     do
       counter=$(( $counter + 1 ))
       echo -n "."
-      sleep 1
+      sleep 2
       if openstack volume show ${OPENSHIFT_VM_NAME} -f value -c status | grep -q available
       then
         break