Refactor prog to use force flag

ubicloud · Feb 2, 2024 · 3d55c71 · 3d55c71
1 parent f86eee2
commit 3d55c71
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/prog/download_boot_image.rb b/prog/download_boot_image.rb
@@ -25,10 +25,7 @@ def blob_storage_client
   end
 
   label def wait_draining
-    unless vm_host.vms.empty?
-      nap 15
-    end
-    sshable.cmd("sudo rm -f /var/storage/images/#{image_name.shellescape}.raw")
+    nap 15 unless vm_host.vms.empty?
     hop_download
   end
 
@@ -72,6 +69,9 @@ def blob_storage_client
   end
 
   label def activate_host
+    # Verify that the image was downloaded
+    sshable.cmd("ls /var/storage/images/#{image_name}.raw")
+
     vm_host.update(allocation_state: "accepting")
 
     pop "#{image_name} downloaded"

diff --git a/rhizome/host/bin/download-boot-image b/rhizome/host/bin/download-boot-image
@@ -11,4 +11,4 @@ custom_url = ARGV.shift
 require_relative "../../common/lib/util"
 require_relative "../lib/vm_setup"
 
-VmSetup.new("").download_boot_image(boot_image, custom_url: custom_url)
+VmSetup.new("").download_boot_image(boot_image, force: true, custom_url: custom_url)