abiquo-etk 0.4.25 → 0.4.29

data/Rakefile

@@ -6,7 +6,7 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "abiquo-etk"
     gem.summary = %Q{Abiquo Elite Toolkit}
-    gem.description = %Q{Tools to troubleshoot your Abiquo installation}
+    gem.description = %Q{Tools to troubleshoot and manage your Abiquo installation}
     gem.email = "srubio@abiquo.com"
     gem.homepage = "http://github.com/abiquo/abiquo-etk"
     gem.authors = ["Sergio Rubio"]

data/VERSION

@@ -1 +1 @@
-0.4.25
+0.4.29

data/abiquo-etk.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{abiquo-etk}
-  s.version = "0.4.25"
+  s.version = "0.4.29"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergio Rubio"]
-  s.date = %q{2010-10-27}
-  s.description = %q{Tools to troubleshoot your Abiquo installation}
+  s.date = %q{2010-10-29}
+  s.description = %q{Tools to troubleshoot and manage 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"]
+  s.executables = ["abiquo-check-16-install", "abicli", "abiquo-initenv"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc",
@@ -30,9 +30,7 @@ Gem::Specification.new do |s|
      "abiquo-etk.spec",
      "bin/abicli",
      "bin/abiquo-check-16-install",
-     "bin/aetk-setup-rs",
-     "bin/aetk-setup-server",
-     "bin/aetk-setup-v2v",
+     "bin/abiquo-initenv",
      "lib/abicli/commands/instant-deploy.rb",
      "lib/abicli/commands/remote-services-settings.rb",
      "lib/abicli/commands/server-settings.rb",

data/abiquo-etk.spec

@@ -5,7 +5,7 @@
 
 Summary: Abiquo Elite Toolkit
 Name: rubygem-%{gemname}
-Version: 0.4.22
+Version: 0.4.28
 Release: 1%{?dist}
 Group: Development/Languages
 License: GPLv2+ or Ruby
@@ -57,6 +57,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 29 2010 : Sergio Rubio <srubio@abiquo.com> - 0.4.28-1
+- Updated to upstream 0.4.28
+
+* Thu Oct 28 2010 : Sergio Rubio <srubio@abiquo.com> - 0.4.27-1
+- Updated to upstream 0.4.27
+
 * Thu Oct 25 2010 : Sergio Rubio <srubio@abiquo.com> - 0.4.22-1
 - Updated to upstream 0.4.22
 

data/bin/abicli

@@ -34,6 +34,10 @@ def config_get_node(cf, path)
 end
 
 def config_set_attribute(file, path, attrname, val, write_changes = false)
+  if not File.exist?(file)
+    AETK::Log.instance.error "config_set_attribute: file #{file} not found."
+  end
+
   doc = Nokogiri::XML(File.new(file))
 	doc.root.xpath(path).first[attrname] = (val||'')
   if write_changes
@@ -41,6 +45,7 @@ def config_set_attribute(file, path, attrname, val, write_changes = false)
       f.puts doc.to_xml
     end
   end
+
   return doc
 end
 

data/bin/abiquo-check-16-install

@@ -72,7 +72,7 @@ class MyCLI
     :long  => "--debug",
     :description => "Set the log level to debug",
     #:required => true,
-    :proc => Proc.new { |l| Log.level = Logger::DEBUG }
+    :proc => Proc.new { |l| AETK::Log.instance.level = Logger::DEBUG }
   
   option :print_configs,
     :long  => "--print-configs",

data/bin/abiquo-initenv

@@ -0,0 +1,136 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'abiquo-etk'
+
+def create_schemas(user = 'root', password = '')
+  log = AETK::Log.instance
+  cmd = ''
+  if password.strip.chomp.empty? 
+    cmd = "mysql -u #{user} "
+  else
+    cmd = "mysql -u #{user} -p#{password} "
+  end
+
+  if `#{cmd} -e 'show databases'|grep kinton`.strip.chomp.empty?
+    cib = false
+    if File.exist? '/etc/abiquo-release'
+      if File.readlines('/etc/abiquo-release').join =~ /cloud-in-a-box/
+        log.info 'Cloud in a Box profile found'
+        cib = true
+      end
+    end
+    if cib
+      out = `mysql -u root < /usr/share/doc/abiquo-16-pocsetup/cloud-in-a-box.sql`
+      if $?.exitstatus == 0 
+        log.info 'cloud-in-a-box schema imported succesfully.'
+      else
+        log.error "Error importing cloud-in-a-box schema: #{out}"
+      end
+    else
+      out = `mysql -u root < /usr/share/doc/abiquo-server/database/kinton-schema.sql`
+      if $?.exitstatus == 0 
+        log.info 'kinton-schema imported succesfully.'
+      else
+        log.error "Error importing kinton-schema: #{out}"
+      end
+      out = `mysql -u root < /usr/share/doc/abiquo-server/database/kinton-premium-schema.sql`
+      if $?.exitstatus == 0 
+        log.info 'kinton-premium-schema imported succesfully.'
+      else
+        log.error "Error importing kinton-premium-schema: #{out}"
+      end
+    end
+  else
+    log.warn 'kinton schema found. Skipping schema creation.'
+  end
+  
+end
+
+def init_server_install
+  config_file ='/etc/sysconfig/abiquo-server'
+  log = AETK::Log.instance
+
+  log.info "Server install detected. Setting up the environment."
+  begin
+    if File.exist? config_file 
+      @settings = abiquo_server_settings
+    else
+      log.error "Config file #{config_file} does not exist. Exit."
+      exit
+    end
+
+    log.info "Setting EventSink URL"
+    `abicli set event-sink-url http://#{@settings['abiquo_server_ip']}/server/EventSink`
+    
+    log.info "Setting DB Properties"
+    `abicli set database-host #{@settings['abiquo_db_host']}`
+    `abicli set database-user root`
+    `abicli set database-password #{@settings['abiquo_db_password']}`
+    `abicli set mail-server 127.0.0.1`
+      
+    log.info "Creating database schemas..."
+    create_schemas
+  rescue Exception => e
+    log.error "Unhandled exception: #{e.message}"
+    log.error "Unhandled exception: #{e.backtrace}"
+  end
+end
+
+def init_remote_services_install
+  config_file ='/etc/sysconfig/abiquo-rs'
+
+  log = AETK::Log.instance
+  log.info "Remote Services install detected. Setting up the environment."
+
+  begin
+    @settings = {}
+    if File.exist? config_file
+      @settings = abiquo_rs_settings
+    else
+      log.error "Config file #{config_file} does not exist. Exit."
+      exit
+    end
+    repo = @settings['abiquo_nfs_repository']
+    if repo =~ /localhost|127.0.0.1/
+      if File.exist? '/etc/sysconfig/abiquo-server'
+        log.info "NFS Repository points to localhost, fixing..."
+        s = abiquo_server_settings
+        repo = s['abiquo_server_ip'] + ':/opt/vm_repository'
+      end
+    end
+    log.info "Setting nfs-repository to #{repo}"
+    `abicli set nfs-repository #{repo}`
+    log.info "Setting cifs-repository to #{repo}"
+    `abicli set cifs-repository //your-cifs-server-ip-here/opt/vm_repository`
+
+  rescue Exception => e
+    log.error "Unhandled exception: #{e.message}"
+    log.error "Unhandled exception: #{e.backtrace}"
+  end
+end
+
+def init_v2v_install
+  config_file ='/etc/sysconfig/abiquo-server'
+  log = AETK::Log.instance
+  log.info "V2V install detected. Setting up the environment."
+end
+
+def init_rs_plus_v2v_install
+  init_remote_services_install
+  init_v2v_install
+end
+
+AETK::Log.instance.info "Running abiquo-initenv..."
+case AETK::System.detect_install_type 
+when :server
+  init_server_install
+when :remote_services
+  init_remote_services_install
+when :v2v
+  init_v2v_install
+when :rs_plus_v2v
+  init_rs_plus_v2v_install
+else
+  AETK::Log.instance.error "Couldn't detect install type. Skipping first setup."
+end

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

@@ -16,6 +16,18 @@ if ARGV[0] == 'instant-deploy'
   require 'uri'
   require 'fileutils'
 
+  class SystemCommands
+
+    def self.kvm=(path)
+      @@kvm = path
+    end
+
+    def self.kvm
+      @@kvm
+    end
+    
+  end
+
   class HTTPDownloader
     def self.match?(uri)
       # URI.parse barfs on '<drive letter>:\\files \on\ windows'
@@ -90,8 +102,18 @@ if ARGV[0] == 'instant-deploy'
 
     option :tomcat_port,
       :long => '--tomcat-port PORT',
-      :description => 'Forwarded Tomcat port (Default 8980',
+      :description => 'Forwarded Tomcat port (Default 8980)',
       :default => '8980'
+
+    option :vnc,
+      :long => '--vnc',
+      :description => 'Use VNC instead of SDL/Graphical display',
+      :default => false
+
+    option :vnc_display,
+      :long => '--vnc-display DISP',
+      :description => 'Use VNC display DISP',
+      :default => 0
     
     option :help,
       :short => "-h",
@@ -103,28 +125,55 @@ if ARGV[0] == 'instant-deploy'
       :exit => 0
   end
 
-  def preflight_check
+  def pfcheck_ubuntu
+    if (File.read('/etc/lsb-release') !~ /DISTRIB_ID=Ubuntu/)
+      $stderr.puts "\nUbuntu not found. Your distribution is not supported.\n\n"
+      exit
+    end
+    
     #
-    # Check if this is Ubuntu
+    # Check if KVM installed
     #
-    if not File.exists? '/etc/lsb-release'
-      $stderr.puts "\nYou are not running Ubuntu. Other distributions are not supported.\n\n"
+    if `which /usr/bin/kvm`.strip.chomp.empty?
+      $stderr.puts "\nKVM not found. Install it first:\n\n"
+      $stderr.puts "sudo apt-get install kvm\n\n"
       exit
     end
-    if not (File.read('/etc/lsb-release') =~ /DISTRIB_ID=Ubuntu/)
-      $stderr.puts "\nYou are not running Ubuntu. Other distributions are not supported\n\n"
+    
+    SystemCommands.kvm = '/usr/bin/kvm'
+  end
+
+  def pfcheck_redhat
+    if File.read('/etc/redhat-release') !~ /^(FrameOS|CentOS)/
+      $stderr.puts "\nRHEL not found. Your distribution is not supported.\n\n"
       exit
     end
-
+    
     #
     # Check if KVM installed
     #
-    if `which /usr/bin/kvm`.strip.chomp.empty?
+    if `which /usr/libexec/qemu-kvm`.strip.chomp.empty?
       $stderr.puts "\nKVM not found. Install it first:\n\n"
-      $stderr.puts "sudo apt-get install kvm\n\n"
+      $stderr.puts "yum install kvm\n\n"
       exit
     end
     
+    SystemCommands.kvm = '/usr/libexec/qemu-kvm'
+  end
+
+  def preflight_check
+    #
+    # Check if this is Ubuntu
+    #
+    if File.exist?('/etc/lsb-release')
+      pfcheck_ubuntu
+    elsif File.exist?('/etc/redhat-release')
+      pfcheck_redhat
+    else
+      $stderr.puts "\nOnly Ubuntu and RHEL distributions are supported.\n\n"
+      exit
+    end
+
     #
     # Check if qemu-img installed
     #
@@ -142,6 +191,10 @@ if ARGV[0] == 'instant-deploy'
     mem = params[:mem]
     tomcat_port = params[:tomcat_port]
     ssh_port = params[:ssh_port]
+    graphics = ''
+    if params[:vnc]
+      graphics = "--vnc :#{params[:vnc_display]}"
+    end
     # Create target directory
     begin
       FileUtils.mkdir(target_dir)
@@ -196,16 +249,19 @@ if ARGV[0] == 'instant-deploy'
       f.puts "MEM=#{mem}"
       f.puts "TAP=vtap0"
       f.puts ""
-      f.puts "kvm -m #{mem} -drive file=#{File.basename(disk_file)} -net user,hostfwd=tcp:0.0.0.0:#{tomcat_port}-:8080,hostfwd=tcp:0.0.0.0:#{ssh_port}-:22 -net nic -boot order=c > /dev/null"
+      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 ""
       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 "#kvm -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} #{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 `
+    if $? != 0
+      puts "Error booting the VM: #{output}"
     end
-    boot_vm :disk_file => disk_file, :cdrom => cdrom, :mem => mem, :tomcat_port => tomcat_port, :ssh_port => ssh_port
   end
 
   def distribution_version
@@ -214,18 +270,6 @@ if ARGV[0] == 'instant-deploy'
     version
   end
 
-  def boot_vm(params = {})
-    disk_file = params[:disk_file]
-    cdrom = params[:cdrom]
-    mem = params[:mem]
-    tomcat_port = params[:tomcat_port]
-    ssh_port = params[:ssh_port]
-    output = `kvm -m 1024 -drive file=#{disk_file} -net user,hostfwd=tcp:0.0.0.0:#{tomcat_port}-:8080,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
-  end
-
   target_dir = "abiquo-instant-deploy-#{Time.now.strftime "%s"}"
 
   trap("INT") { puts "\n\nCleaning Environment..."; exit } 
@@ -246,7 +290,9 @@ 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],
-              :ssh_port => cli.config[:ssh_port]
+              :ssh_port => cli.config[:ssh_port],
+              :vnc => cli.config[:vnc],
+              :vnc_display => cli.config[:vnc_display]
              )
 
 end

data/lib/abicli/commands/set.rb

@@ -156,7 +156,11 @@ if ARGV[0] == 'set'
       exit 0
     end
     file = File.join(ABIQUO_BASE_DIR, "config/#{comp}.xml")
-    config_set_node(file, path, val, true)
+    if not File.exist?(file)
+      AETK::Log.instance.error "File #{file} does not exist. Skip setting the property: #{path}"
+    else
+      config_set_node(file, path, val, true)
+    end
   rescue NoMethodError => e
     $stderr.puts e.message
     $stderr.puts e.backtrace

data/lib/abicli/commands/smoketest.rb

@@ -24,7 +24,7 @@ if ARGV[0] == 'smoketest'
     option :port,
       :long => '--port PORT',
       :description => 'API Server Port',
-      :default => 8080
+      :default => 80
     
     option :dc_name,
       :long => '--dc-name DCNAME',
@@ -69,11 +69,11 @@ if ARGV[0] == 'smoketest'
   begin
     puts "Creating Datacenter #{cli.config[:dc_name]} remote services..."
     rs =  dc.remoteServices
-    rs.create :type => 'VIRTUAL_FACTORY', :uri => 'http://localhost:8080/virtualfactory'
-    rs.create :type => 'STORAGE_SYSTEM_MONITOR', :uri => 'http://localhost:8080/ssm'
-    rs.create :type => 'VIRTUAL_SYSTEM_MONITOR', :uri => 'http://localhost:8080/vsm'
-    rs.create :type => 'NODE_COLLECTOR', :uri => 'http://localhost:8080/nodecollector'
-    rs.create :type => 'APPLIANCE_MANAGER', :uri => 'http://localhost:8080/am'
+    rs.create :type => 'VIRTUAL_FACTORY', :uri => 'http://localhost:80/virtualfactory'
+    rs.create :type => 'STORAGE_SYSTEM_MONITOR', :uri => 'http://localhost:80/ssm'
+    rs.create :type => 'VIRTUAL_SYSTEM_MONITOR', :uri => 'http://localhost:80/vsm'
+    rs.create :type => 'NODE_COLLECTOR', :uri => 'http://localhost:80/nodecollector'
+    rs.create :type => 'APPLIANCE_MANAGER', :uri => 'http://localhost:80/am'
     rs.create :type => 'DHCP_SERVICE', :uri => 'http://localhost:7911'
     rs.create :type => 'BPM_SERVICE', :uri => 'http://localhost:7911'
   rescue Resourceful::UnsuccessfulHttpRequestError

data/lib/abicli/commands/upload-template.rb

@@ -194,7 +194,7 @@ if ARGV[0] == 'upload-template'
 
     option :rs_url,
       :long => '--rs-url URL',
-      :description => 'Remote Services URL (i.e. http://remote-services-ip:8080)'
+      :description => 'Remote Services URL (i.e. http://remote-services-ip)'
 
     option :debug,
       :long => '--debug',

data/lib/abiquo-etk.rb

@@ -29,12 +29,6 @@ ABIQUO_NODECOLLECTOR_CONFIG = '/opt/abiquo/config/nodecollector.xml'
 ABIQUO_AM_CONFIG = '/opt/abiquo/config/am.xml'
 ABIQUO_BPMASYNC_CONFIG = '/opt/abiquo/config/bpm-async.xml'
 
-#
-# INIT
-#
-Log = Logger.new "check.log"
-Log.level = Logger::INFO
-
 def abiquo_edition
 end
 
@@ -137,6 +131,15 @@ def abiquo_bpmasync_config
 end
 
 module AETK
+  
+  class Log
+
+    def self.instance(file = '/var/log/abiquo-etk.log')
+      @@logger ||= Logger.new file
+    end
+
+  end
+
 
   module OutputFormatters
     
@@ -147,23 +150,39 @@ module AETK
   end
 
   def detect_install_type
-    if RPMUtils.rpm_installed? 'abiquo-16-pocsetup'
-      return :monolithic
-    end
-    
-    if RPMUtils.rpm_installed? 'abiquo-remote-services'
-      return :remote_services
-    end
-    
-    if RPMUtils.rpm_installed? 'abiquo-v2v'
-      return :remote_v2v
-    end
+    AETK::System.detect_install_type
+  end
 
-    if RPMUtils.rpm_installed? 'abiquo-server'
-      return :server
-    end
-    return :unknown
+  class System
+    def self.detect_install_type
+      found = ['bpm-async', 'am', 'server'].each do |dir|
+        break if not File.directory?(ABIQUO_BASE_DIR + "/tomcat/webapps/#{dir}")
+      end
+      return :monolithic if found
+      
+      found = ['am', 'virtualfactory', 'bpm-async'].each do |dir|
+        break if not File.directory?(ABIQUO_BASE_DIR + "/tomcat/webapps/#{dir}")
+      end
+      return :rs_plus_v2v if found
+      
+      found = ['am', 'virtualfactory'].each do |dir|
+        break if not File.directory?(ABIQUO_BASE_DIR + "/tomcat/webapps/#{dir}")
+      end
+      return :remote_services if found
+      
+      found = ['server', 'api'].each do |dir|
+        break if not File.directory?(ABIQUO_BASE_DIR + "/tomcat/webapps/#{dir}")
+      end
+      return :server if found
+      
+      found = ['bpm-async'].each do |dir|
+        break if not File.directory?(ABIQUO_BASE_DIR + "/tomcat/webapps/#{dir}")
+      end
+      return :v2v if found
 
+      return :unknown
+
+    end
   end
 
 
@@ -174,9 +193,10 @@ module AETK
       puts "Loading extra plugins...".yellow.bold
       plugins.concat( Dir[extra_plugins_dir + '/*.rb'].sort )
     end
-    if Log.level == Logger::DEBUG
+    log = Log.instance
+    if log.level == Logger::DEBUG
       plugins.each do |p|
-        puts "  #{File.basename(p,'.rb')}..."
+        log.debug "  #{File.basename(p,'.rb')}..."
       end
     end
     plugins.each do |p|

data/lib/checks/java.rb

@@ -1,13 +1,14 @@
 if abiquo_installed?
 
 def java_ok?
+  log = AETK::Log.instance
   if not File.exist? JAVA_BIN
-    Log.error "Java binary not found in #{JAVA_BIN}"
+    log.error "Java binary not found in #{JAVA_BIN}"
     return false
   end
 
   if `java -version 2>&1 | grep '64-Bit Server'`.empty?
-    Log.error "Java 64-Bit runtime not found"
+    log.error "Java 64-Bit runtime not found"
     return false
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: abiquo-etk
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 4
-  - 25
-  version: 0.4.25
+  - 29
+  version: 0.4.29
 platform: ruby
 authors: 
 - Sergio Rubio
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 +02:00
+date: 2010-10-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,14 +78,12 @@ dependencies:
         version: "1.2"
   type: :runtime
   version_requirements: *id004
-description: Tools to troubleshoot your Abiquo installation
+description: Tools to troubleshoot and manage your Abiquo installation
 email: srubio@abiquo.com
 executables: 
 - abiquo-check-16-install
-- aetk-setup-rs
-- aetk-setup-v2v
 - abicli
-- aetk-setup-server
+- abiquo-initenv
 extensions: []
 
 extra_rdoc_files: 
@@ -104,9 +102,7 @@ files:
 - abiquo-etk.spec
 - bin/abicli
 - bin/abiquo-check-16-install
-- bin/aetk-setup-rs
-- bin/aetk-setup-server
-- bin/aetk-setup-v2v
+- bin/abiquo-initenv
 - lib/abicli/commands/instant-deploy.rb
 - lib/abicli/commands/remote-services-settings.rb
 - lib/abicli/commands/server-settings.rb

data/bin/aetk-setup-rs

@@ -1,36 +0,0 @@
-#!/usr/bin/env ruby
-require 'logger'
-require 'abiquo-etk'
-
-CONFIG_FILE='/etc/sysconfig/abiquo-rs'
-
-Log = Logger.new "/var/log/abiquo-etk.log"
-Log.level = Logger::INFO
-
-begin
-	@settings = {}
-	if File.exist? CONFIG_FILE
-    @settings = abiquo_rs_settings
-	else
-		Log.error "Config file #{CONFIG_FILE} does not exist. Exit."
-		exit
-	end
-  repo = @settings['abiquo_nfs_repository']
-  if repo =~ /localhost|127.0.0.1/
-    if File.exist? '/etc/sysconfig/abiquo-server'
-      Log.info "NFS Repository points to localhost, fixing..."
-      s = abiquo_server_settings
-      repo = s['abiquo_server_ip'] + ':/opt/vm_repository'
-    end
-  end
-  Log.info "Setting nfs-repository to #{repo}"
-  `abicli set nfs-repository #{repo}`
-  Log.info "Setting cifs-repository to #{repo}"
-  `abicli set cifs-repository //your-cifs-server-ip-here/opt/vm_repository`
-
-rescue Exception => e
-	Log.error "Unhandled exception: #{e.message}"
-	Log.error "Unhandled exception: #{e.backtrace}"
-end
-
-

data/bin/aetk-setup-server

@@ -1,77 +0,0 @@
-#!/usr/bin/env ruby
-require 'logger'
-require 'abiquo-etk'
-
-CONFIG_FILE='/etc/sysconfig/abiquo-server'
-
-Log = Logger.new('/var/log/abiquo-etk.log')
-Log.level = Logger::INFO
-
-def create_schemas(user = 'root', password = '')
-  cmd = ''
-  if password.strip.chomp.empty? 
-    cmd = "mysql -u #{user} "
-  else
-    cmd = "mysql -u #{user} -p#{password} "
-  end
-
-  if `#{cmd} -e 'show databases'|grep kinton`.strip.chomp.empty?
-    cib = false
-    if File.exist? '/etc/abiquo-release'
-      if File.readlines('/etc/abiquo-release').join =~ /cloud-in-a-box/
-        Log.info 'Cloud in a Box profile found'
-        cib = true
-      end
-    end
-    if cib
-      out = `mysql -u root < /usr/share/doc/abiquo-16-pocsetup/cloud-in-a-box.sql`
-      if $?.exitstatus == 0 
-        Log.info 'cloud-in-a-box schema imported succesfully.'
-      else
-        Log.error "Error importing cloud-in-a-box schema: #{out}"
-      end
-    else
-      out = `mysql -u root < /usr/share/doc/abiquo-server/database/kinton-schema.sql`
-      if $?.exitstatus == 0 
-        Log.info 'kinton-schema imported succesfully.'
-      else
-        Log.error "Error importing kinton-schema: #{out}"
-      end
-      out = `mysql -u root < /usr/share/doc/abiquo-server/database/kinton-premium-schema.sql`
-      if $?.exitstatus == 0 
-        Log.info 'kinton-premium-schema imported succesfully.'
-      else
-        Log.error "Error importing kinton-premium-schema: #{out}"
-      end
-    end
-  else
-    Log.warn 'kinton schema found. Skipping schema creation.'
-  end
-  
-end
-
-begin
-	if File.exist? CONFIG_FILE
-    @settings = abiquo_server_settings
-	else
-		Log.error "Config file #{CONFIG_FILE} does not exist. Exit."
-		exit
-	end
-
-  Log.info "Setting EventSink URL"
-  `abicli set event-sink-url http://#{@settings['abiquo_server_ip']}:8080/server/EventSink`
-  
-  Log.info "Setting DB Properties"
-  `abicli set database-host #{@settings['abiquo_db_host']}`
-  `abicli set database-user root`
-  `abicli set database-password #{@settings['abiquo_db_password']}`
-  `abicli set mail-server 127.0.0.1`
-    
-  Log.info "Creating database schemas..."
-  create_schemas
-rescue Exception => e
-	Log.error "Unhandled exception: #{e.message}"
-	Log.error "Unhandled exception: #{e.backtrace}"
-end
-
-

data/bin/aetk-setup-v2v

@@ -1,33 +0,0 @@
-#!/usr/bin/env ruby
-require 'logger'
-
-CONFIG_FILE='/etc/sysconfig/abiquo-server'
-
-Log = Logger.new('/var/log/abiquo-etk.log')
-Log.level = Logger::INFO
-
-begin
-	@settings = {}
-	if File.exist? CONFIG_FILE
-		File.read(CONFIG_FILE).each_line do |l|
-			next if l.strip.chomp.empty?
-			key,val = l.strip.chomp.split('=')
-			@settings[key.strip.chomp] = val.strip.chomp rescue ''
-		end
-
-	else
-		Log.error "Config file #{CONFIG_FILE} does not exist. Exit."
-		exit
-	end
-
-	Log.info "Setting db user/password in localhost bpm-async context.xml"
-  `sed -i 's/localhost/0\.0\.0\.0/' /opt/abiquo/tomcat/webapps/bpm-async/WEB-INF/classes/activemq.xml`
-  `abicli set database-host #{@settings['abiquo_db_host']}`
-  `abicli set database-user root`
-  `abicli set database-password #{@settings['abiquo_db_password']}`
-rescue Exception => e
-	Log.error "Unhandled exception: #{e.message}"
-	Log.error "Unhandled exception: #{e.backtrace}"
-end
-
-