abiquo-etk 0.4.20 → 0.4.22

data/Rakefile

@@ -12,6 +12,7 @@ begin
     gem.authors = ["Sergio Rubio"]
     gem.version = File.read 'VERSION'
     gem.add_dependency(%q<nokogiri>, [">= 1.3"])
+    gem.add_dependency(%q<rpm-utils>, [">= 0.1"])
     gem.add_dependency(%q<term-ansicolor>, [">= 1.0"])
     gem.add_dependency(%q<mixlib-cli>, [">= 1.2"])
     gem.files.include %w(

data/VERSION

@@ -1 +1 @@
-0.4.20
+0.4.22

data/abiquo-etk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{abiquo-etk}
-  s.version = "0.4.20"
+  s.version = "0.4.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergio Rubio"]
-  s.date = %q{2010-10-21}
+  s.date = %q{2010-10-22}
   s.description = %q{Tools to troubleshoot your Abiquo installation}
   s.email = %q{srubio@abiquo.com}
   s.executables = ["abiquo-check-16-install", "aetk-setup-rs", "aetk-setup-v2v", "abicli", "aetk-setup-server"]
@@ -562,15 +562,18 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.3"])
+      s.add_runtime_dependency(%q<rpm-utils>, [">= 0.1"])
       s.add_runtime_dependency(%q<term-ansicolor>, [">= 1.0"])
       s.add_runtime_dependency(%q<mixlib-cli>, [">= 1.2"])
     else
       s.add_dependency(%q<nokogiri>, [">= 1.3"])
+      s.add_dependency(%q<rpm-utils>, [">= 0.1"])
       s.add_dependency(%q<term-ansicolor>, [">= 1.0"])
       s.add_dependency(%q<mixlib-cli>, [">= 1.2"])
     end
   else
     s.add_dependency(%q<nokogiri>, [">= 1.3"])
+    s.add_dependency(%q<rpm-utils>, [">= 0.1"])
     s.add_dependency(%q<term-ansicolor>, [">= 1.0"])
     s.add_dependency(%q<mixlib-cli>, [">= 1.2"])
   end

data/abiquo-etk.spec

@@ -5,7 +5,7 @@
 
 Summary: Abiquo Elite Toolkit
 Name: rubygem-%{gemname}
-Version: 0.4.14
+Version: 0.4.20
 Release: 1%{?dist}
 Group: Development/Languages
 License: GPLv2+ or Ruby
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 21 2010 : Sergio Rubio <srubio@abiquo.com> - 0.4.20-1
+- Updated to upstream 0.4.20
+
 * Wed Oct 20 2010 : Sergio Rubio <srubio@abiquo.com> - 0.4.14-1
 - Updated to upstream 0.4.14
 

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

@@ -77,6 +77,11 @@ if ARGV[0] == 'instant-deploy'
     option :iso_url,
       :long => '--iso-url URL',
       :description => 'Abiquo ISO URL'
+
+    option :mem,
+      :long => '--mem MEM',
+      :description => 'Virtual Machine memory (in bytes)',
+      :default => '512'
     
     option :help,
       :short => "-h",
@@ -124,6 +129,7 @@ if ARGV[0] == 'instant-deploy'
     target_dir = params[:target_dir] || "abiquo-instant-deploy-#{Time.now.strftime "%s"}"
     disk_file = params[:disk_file] || "#{target_dir}/abiquo.qcow2"
     iso_url = params[:iso_url]
+    mem = params[:mem]
     # Create target directory
     begin
       FileUtils.mkdir(target_dir)
@@ -168,7 +174,25 @@ if ARGV[0] == 'instant-deploy'
     puts "\nhttp://127.0.0.1:8980/client-premium\n\n"
     puts "To open the Abiquo Web Console."
     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 `
+    File.open(target_dir + '/run.sh', 'w') do |f|
+      f.puts "#!/bin/sh"
+      f.puts "MEM=#{mem}"
+      f.puts "kvm -m #{mem} -drive file=#{File.basename(disk_file)} -net user,hostfwd=tcp:127.0.0.1:8980-:8080,hostfwd=tcp:127.0.0.1:2300-:22 -net nic -boot order=c > /dev/null 2>&1"
+    end
+    boot_vm :disk_file => disk_file, :cdrom => cdrom, :mem => mem
+  end
+
+  def distribution_version
+    /DISTRIB_DESCRIPTION="(.*)"/.match File.read('/etc/lsb-release')
+    version = $1.splitp[1] || '0'
+    version
+  end
+
+  def boot_vm(params = {})
+    disk_file = params[:disk_file]
+    cdrom = params[:cdrom]
+    mem = params[:mem]
+    `kvm -m 1024 -drive file=#{disk_file} -net user,hostfwd=tcp:127.0.0.1:8980-:8080,hostfwd=tcp:127.0.0.1:2300-:22 -net nic -drive file=#{cdrom},media=cdrom -boot order=cd -boot once=d > /dev/null 2>&1 `
   end
 
   target_dir = "abiquo-instant-deploy-#{Time.now.strftime "%s"}"
@@ -189,6 +213,6 @@ if ARGV[0] == 'instant-deploy'
   print "Abiquo Instant Deploy: ".bold
   puts "One Command Cloud Builder\n\n"
   puts "Building the cloud into #{target_dir.bold} directory..."
-  install_iso(:target_dir => target_dir, :iso_url => url)
+  install_iso(:target_dir => target_dir, :iso_url => url, :mem => cli.config[:mem])
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: abiquo-etk
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 35
   prerelease: false
   segments: 
   - 0
   - 4
-  - 20
-  version: 0.4.20
+  - 22
+  version: 0.4.22
 platform: ruby
 authors: 
 - Sergio Rubio
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 +02:00
+date: 2010-10-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,9 +34,24 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: term-ansicolor
+  name: rpm-utils
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 1
+        version: "0.1"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: term-ansicolor
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -47,11 +62,11 @@ dependencies:
         - 0
         version: "1.0"
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mixlib-cli
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,7 +77,7 @@ dependencies:
         - 2
         version: "1.2"
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 description: Tools to troubleshoot your Abiquo installation
 email: srubio@abiquo.com
 executables: