abiquo-etk 0.4.32 → 0.4.33

data/VERSION

@@ -1 +1 @@
-0.4.32
+0.4.33

data/abiquo-etk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{abiquo-etk}
-  s.version = "0.4.32"
+  s.version = "0.4.33"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergio Rubio"]
-  s.date = %q{2010-11-03}
+  s.date = %q{2010-11-04}
   s.description = %q{Tools to troubleshoot and manage your Abiquo installation}
   s.email = %q{srubio@abiquo.com}
   s.executables = ["abiquo-check-16-install", "abicli", "abiquo-initenv"]

data/abiquo-etk.spec

@@ -5,7 +5,7 @@
 
 Summary: Abiquo Elite Toolkit
 Name: rubygem-%{gemname}
-Version: 0.4.32
+Version: 0.4.33
 Release: 1%{?dist}
 Group: Development/Languages
 License: GPLv2+ or Ruby
@@ -55,6 +55,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Nov 04 2010 : Sergio Rubio <srubio@abiquo.com> - 0.4.33-1
+- Updated to upstream 0.4.33-1
+
 * Tue Nov 03 2010 : Sergio Rubio <srubio@abiquo.com> - 0.4.32-1
 - Updated to upstream 0.4.32-1
 

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

@@ -86,6 +86,16 @@ if ARGV[0] == 'instant-deploy'
   class InstantDeployCLI
     include Mixlib::CLI
 
+    option :target_dir,
+      :long => '--target-dir NAME',
+      :description => 'Directory where the VM disk and ISO are created',
+      :default => "abiquo-instant-deploy-#{Time.now.strftime "%s"}"
+    
+    option :vm_name,
+      :long => '--vm-name NAME',
+      :description => 'Virtual Machine name',
+      :default => "instant-deploy"
+
     option :iso_url,
       :long => '--iso-url URL',
       :description => 'Abiquo ISO URL'
@@ -192,6 +202,8 @@ if ARGV[0] == 'instant-deploy'
     tomcat_port = params[:tomcat_port]
     ssh_port = params[:ssh_port]
     graphics = ''
+    vm_name = params[:vm_name]
+
     if params[:vnc]
       graphics = "--vnc :#{params[:vnc_display]}"
     end
@@ -249,16 +261,16 @@ if ARGV[0] == 'instant-deploy'
       f.puts "MEM=#{mem}"
       f.puts "TAP=vtap0"
       f.puts ""
-      f.puts "#{SystemCommands.kvm} #{graphics} -m $MEM -drive file=#{File.basename(disk_file)} -net user,hostfwd=tcp:0.0.0.0:#{tomcat_port}-:80,hostfwd=tcp:0.0.0.0:#{ssh_port}-:22 -net nic -boot order=c > /dev/null"
+      f.puts "#{SystemCommands.kvm} -name #{vm_name} #{graphics} -m $MEM -drive file=#{File.basename(disk_file)} -net user,hostfwd=tcp:0.0.0.0:#{tomcat_port}-:80,hostfwd=tcp:0.0.0.0:#{ssh_port}-:22 -net nic -boot order=c > /dev/null"
       f.puts ""
       f.puts "#"
       f.puts "# Comment the above line and uncomment this to use bridged networking."
       f.puts "# You will need to have a working bridge setup in order to use this."
       f.puts "# Update TAP variable above to fill your needs."
       f.puts "#"
-      f.puts "#sudo #{SystemCommands.kvm} #{graphics} -m $MEM -drive file=#{File.basename(disk_file)} -net tap,ifname=$TAP -net nic -boot order=c > /dev/null 2>&1"
+      f.puts "#sudo #{SystemCommands.kvm} -name #{vm_name} #{graphics} -m $MEM -drive file=#{File.basename(disk_file)} -net tap,ifname=$TAP -net nic -boot order=c > /dev/null 2>&1"
     end
-    output = `#{SystemCommands.kvm} #{graphics} -m 1024 -drive file=#{disk_file} -net user,hostfwd=tcp:0.0.0.0:#{tomcat_port}-:80,hostfwd=tcp:0.0.0.0:#{ssh_port}-:22 -net nic -drive file=#{cdrom},media=cdrom -boot order=cd -boot once=d 2>&1 `
+    output = `#{SystemCommands.kvm} -name #{vm_name} #{graphics} -m 1024 -drive file=#{disk_file} -net user,hostfwd=tcp:0.0.0.0:#{tomcat_port}-:80,hostfwd=tcp:0.0.0.0:#{ssh_port}-:22 -net nic -drive file=#{cdrom},media=cdrom -boot order=cd -boot once=d 2>&1 `
     if $? != 0
       puts "Error booting the VM: #{output}"
     end
@@ -270,14 +282,13 @@ if ARGV[0] == 'instant-deploy'
     version
   end
 
-  target_dir = "abiquo-instant-deploy-#{Time.now.strftime "%s"}"
-
   trap("INT") { puts "\n\nCleaning Environment..."; exit } 
 
   preflight_check
 
   cli = InstantDeployCLI.new
   cli.parse_options
+  target_dir = cli.config[:target_dir]
   url = cli.config[:iso_url]
   if url.nil?
     $stderr.puts "\n--iso-url argument is mandatory.\n\n"
@@ -290,6 +301,7 @@ if ARGV[0] == 'instant-deploy'
   puts "Building the cloud into #{target_dir.bold} directory..."
   install_iso(:target_dir => target_dir, :iso_url => url, :mem => cli.config[:mem],
               :tomcat_port => cli.config[:tomcat_port],
+              :vm_name => cli.config[:vm_name],
               :ssh_port => cli.config[:ssh_port],
               :vnc => cli.config[:vnc],
               :vnc_display => cli.config[:vnc_display]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: abiquo-etk
 version: !ruby/object:Gem::Version 
-  hash: 79
+  hash: 77
   prerelease: false
   segments: 
   - 0
   - 4
-  - 32
-  version: 0.4.32
+  - 33
+  version: 0.4.33
 platform: ruby
 authors: 
 - Sergio Rubio
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 +01:00
+date: 2010-11-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency