abiquo-etk 0.4.18 → 0.4.19

data/VERSION

@@ -1 +1 @@
-0.4.18
+0.4.19

data/abiquo-etk.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{abiquo-etk}
-  s.version = "0.4.18"
+  s.version = "0.4.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergio Rubio"]

data/lib/abicli/commands/instant-deploy.rb

@@ -138,22 +138,37 @@ if ARGV[0] == 'instant-deploy'
     end
     `/usr/bin/qemu-img create -f qcow2 #{disk_file} 20GB`
   
-    # Download the iso
-    downloader = HTTPDownloader.new
-    puts "Downloading Abiquo ISO..."
-    begin
-      downloader.download! iso_url, File.new(target_dir + '/instant-deploy.iso', 'w')
-    rescue Exception
-      $stderr.puts "Error downloading Abiquo ISO. Aborting."
-      exit
+
+    if iso_url =~ /http:\/\//
+      # Download the iso
+      downloader = HTTPDownloader.new
+      puts "Downloading Abiquo ISO..."
+      cdrom = ""
+      begin
+        downloader.download! iso_url, File.new(target_dir + '/instant-deploy.iso', 'w')
+        cdrom = target_dir + '/instant-deploy.iso'
+      rescue Exception
+        $stderr.puts "Error downloading Abiquo ISO. Aborting."
+        exit
+      end
+    else
+      if iso_url =~ /file:/
+        iso_url.gsub!('file://','')
+      end
+      if not File.exist? iso_url
+        $stderr.puts "The ISO file specified does not exist."
+        exit 1
+      else
+        cdrom = iso_url
+      end
     end
 
-    puts "\nBooting the Installer...\n\n"
     # Boot
     puts "\nAfter the install process, open the browser and type:\n"
     puts "\nhttp://127.0.0.1:8980/client-premium\n\n"
     puts "To open the Abiquo Web Console."
-    `kvm -m 1024 -drive file=#{disk_file},if=scsi,boot=on -net user,hostfwd=tcp:127.0.0.1:8980-:8080,hostfwd=tcp:127.0.0.1:2300-:22 -net nic -cdrom #{target_dir}/instant-deploy.iso -boot once=d > /dev/null 2>&1 `
+    puts "\nBooting the Installer...\n\n"
+    `kvm -m 1024 -drive file=#{disk_file},if=scsi,boot=on -net user,hostfwd=tcp:127.0.0.1:8980-:8080,hostfwd=tcp:127.0.0.1:2300-:22 -net nic -cdrom #{cdrom} -boot once=d > /dev/null 2>&1 `
   end
 
   target_dir = "abiquo-instant-deploy-#{Time.now.strftime "%s"}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: abiquo-etk
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: false
   segments: 
   - 0
   - 4
-  - 18
-  version: 0.4.18
+  - 19
+  version: 0.4.19
 platform: ruby
 authors: 
 - Sergio Rubio