veewee 0.3.0.beta1 → 0.3.0.beta2

data/lib/veewee/provider/kvm/provider.rb

@@ -42,7 +42,7 @@ module Veewee
             # http://www.libvirt.org/html/libvirt-libvirt.html#virGetVersion
             # format major * 1,000,000 + minor * 1,000 + release
             env.logger.info "Checking libvirt version"
-            libvirt_version=conn.libversion
+            libvirt_version=conn.version
             if libvirt_version < 8003
               raise Veewee::Error,"You need at least libvirt version 0.8.3 or higher "
             end

data/lib/veewee/provider/parallels/box/validate_parallels.rb

@@ -4,41 +4,7 @@ module Veewee
       module BoxCommand
 
         def validate_parallels(options)
-          require 'cucumber'
-
-          require 'cucumber/rspec/disable_option_parser'
-          require 'cucumber/cli/main'
-
-          # Passing ssh options via ENV varialbles to cucumber
-          # VEEWEE_SSH_USER, VEEWEE_SSH_PASSWORD ,VEEWEE_SSH_PORT
-          cucumber_vars=ssh_options
-          cucumber_vars.each do |key,value|
-            ENV['VEEWEE_'+key.to_s.upcase]=cucumber_vars[key].to_s
-          end
-
-          # Pass the name of the box
-          ENV['VEEWEE_BOXNAME']=@name
-          ENV['VEEWEE_PROVIDER']="parallels"
-
-          feature_path=File.join(File.dirname(__FILE__),"..","..","..","..","..","validation","veewee.feature")
-
-          features=Array.new
-          features[0]=feature_path
-          features[1]="--tags"
-          features[2]="@parallels"
-
-          begin
-            # The dup is to keep ARGV intact, so that tools like ruby-debug can respawn.
-            failure = Cucumber::Cli::Main.execute(features.dup)
-            Kernel.exit(failure ? 1 : 0)
-          rescue SystemExit => e
-            Kernel.exit(e.status)
-          rescue Exception => e
-            ui.error("#{e.message} (#{e.class})")
-            ui.error(e.backtrace.join("\n"))
-            Kernel.exit(1)
-          end
-
+          validate_tags([ 'parallels','puppet','chef'],options)
         end
       end #Module
 

data/lib/veewee/provider/virtualbox/box/helper/create.rb

@@ -66,11 +66,11 @@ module Veewee
 
 
         def create_disk
-            ui.info "Creating new harddrive of size #{definition.disk_size.to_i} "
+            ui.info "Creating new harddrive of size #{definition.disk_size.to_i}, format #{definition.disk_format}, variant #{definition.disk_variant} "
 
 
             place=get_vbox_home
-            command ="#{@vboxcmd} createhd --filename \"#{File.join(place,name,name+"."+definition.disk_format.downcase)}\" --size \"#{definition.disk_size.to_i}\" --format #{definition.disk_format.downcase}"
+            command ="#{@vboxcmd} createhd --filename \"#{File.join(place,name,name+"."+definition.disk_format.downcase)}\" --size \"#{definition.disk_size.to_i}\" --format #{definition.disk_format.downcase} --variant #{definition.disk_variant.downcase}"
             shell_exec("#{command}")
 
         end
@@ -158,7 +158,7 @@ module Veewee
             if definition.instance_variable_defined?("@#{vm_flag}")
               vm_flag_value=definition.instance_variable_get("@#{vm_flag}")
               ui.info "Setting VM Flag #{vm_flag} to #{vm_flag_value}"
-              ui.warn "Used of #{vm_flag} is deprecated - specify your options in :virtualbox => { : vm_options => [\"#{vm_flag}\" => \"#{vm_flag_value}\"]}"
+              ui.warn "Used of #{vm_flag} is deprecated - specify your options in the definition file as \n :virtualbox => { :vm_options => [\"#{vm_flag}\" => \"#{vm_flag_value}\"]}"
               command="#{@vboxcmd} modifyvm #{name} --#{vm_flag.to_s} #{vm_flag_value}"
               shell_exec("#{command}")
             end

data/lib/veewee/provider/virtualbox/box/validate_vagrant.rb

@@ -3,48 +3,8 @@ module Veewee
     module Virtualbox
       module BoxCommand
 
-        def validate_vagrant(options)
-
-          unless self.running?
-            ui.error "Error:: You tried to validate box '#{name}' but it is not running"
-            exit -1
-          end
-
-          require 'cucumber'
-
-          require 'cucumber/rspec/disable_option_parser'
-          require 'cucumber/cli/main'
-
-          # Passing ssh options via ENV varialbles to cucumber
-          # VEEWEE_SSH_USER, VEEWEE_SSH_PASSWORD ,VEEWEE_SSH_PORT
-          cucumber_vars=self.ssh_options
-          cucumber_vars.each do |key,value|
-            ENV['VEEWEE_'+key.to_s.upcase]=cucumber_vars[key].to_s
-          end
-
-          # Pass the name of the box
-          ENV['VEEWEE_BOXNAME']=@name
-          ENV['VEEWEE_PROVIDER']="virtualbox"
-
-          feature_path=File.join(File.dirname(__FILE__),"..","..","..","..","..","validation","veewee.feature")
-
-          features=Array.new
-          features[0]=feature_path
-          features[1]="--tags"
-          features[2]="@vagrant,@virtualbox"
-
-          begin
-            # The dup is to keep ARGV intact, so that tools like ruby-debug can respawn.
-            failure = Cucumber::Cli::Main.execute(features.dup)
-            Kernel.exit(failure ? 1 : 0)
-          rescue SystemExit => e
-            Kernel.exit(e.status)
-          rescue Exception => e
-            ui.error("#{e.message} (#{e.class})")
-            ui.error(e.backtrace.join("\n"))
-            Kernel.exit(1)
-          end
-
+        def validate_vagrant(options = {})
+          validate_tags( options['tags'],options)
         end
       end #Module
 

data/lib/veewee/provider/vmfusion/box/helper/buildinfo.rb

@@ -6,7 +6,7 @@ module Veewee
         def build_info
           info=super
           output=IO.popen("#{vmrun_cmd.shellescape}").readlines
-          info << {:filename => ".vmfusion_version",:content => output[1].split(/ /)[2..3].join.strip}
+          info << {:filename => ".vmfusion_version",:content => @provider.fusion_version }
         end
 
 
@@ -14,7 +14,7 @@ module Veewee
           # use vmware fusion 3.x as default path
           iso_images_dir="/Library/Application Support/VMware Fusion/isoimages"
 
-          # if path doesn't exist check for vmware fusion 4.x path
+          # if path doesn't exist check for vmware fusion >= 4.x path
           if( ! File.exists?(iso_images_dir) )
             iso_images_dir="/Applications/VMware Fusion.app/Contents/Library/isoimages"
           end
@@ -42,7 +42,11 @@ module Veewee
 
           env.logger.info "About to transfer vmware tools iso buildinfo to the box #{name} - #{ip_address} - #{ssh_options}"
           iso_image=guest_iso_path
-          self.scp(iso_image,File.basename(iso_image))
+          if File.exists?(iso_image)
+            self.scp(iso_image,File.basename(iso_image))
+          else
+            raise Veewee::Error, "We could not find the file #{iso_image}. In newer versions of Fusion, you might have to download the Guest Additions yourself. You can do this by first manually creating a vm and than 'installing the guest additions'"
+          end
         end
 
       end

data/lib/veewee/provider/vmfusion/box/template.rb

@@ -18,10 +18,19 @@ module Veewee
           floppy_path=File.join(definition.path,'virtualfloppy.img')
         end
 
+        # Depending on the fusion version, we need to update the virtualhw version
+        if @provider.fusion_version.start_with?('5.')
+          virtualhw_version = 9
+        else
+          virtualhw_version = 7
+        end
+
+        # Setup the variables for in the erb template
         data = {
           :cpu_count => definition.cpu_count, :memory_size => definition.memory_size,
           :controller_type => "lsilogic",
           :fusion_os_type => definition.os_type_id,
+          :virtualhw_version => virtualhw_version,
           :floppyfile => floppy_path,
           :mac_addres => "auto generated",
           :iso_file => "#{File.join(env.config.veewee.iso_dir,definition.iso_file)}",

data/lib/veewee/provider/vmfusion/box/template.vmx.erb

@@ -1,6 +1,6 @@
 .encoding = "UTF-8"
 config.version = "8"
-virtualHW.version = "7"
+virtualHW.version = <%= virtualhw_version %>
 numvcpus = "<%= cpu_count %>"
 scsi0.present = "TRUE"
 scsi0.virtualDev = "<%= controller_type %>"

data/lib/veewee/provider/vmfusion/box/validate_vmfusion.rb

@@ -4,41 +4,7 @@ module Veewee
       module BoxCommand
 
         def validate_vmfusion(options)
-          require 'cucumber'
-
-          require 'cucumber/rspec/disable_option_parser'
-          require 'cucumber/cli/main'
-
-          # Passing ssh options via ENV varialbles to cucumber
-          # VEEWEE_SSH_USER, VEEWEE_SSH_PASSWORD ,VEEWEE_SSH_PORT
-          cucumber_vars=ssh_options
-          cucumber_vars.each do |key,value|
-            ENV['VEEWEE_'+key.to_s.upcase]=cucumber_vars[key].to_s
-          end
-
-          # Pass the name of the box
-          ENV['VEEWEE_BOXNAME']=@name
-          ENV['VEEWEE_PROVIDER']="vmfusion"
-
-          feature_path=File.join(File.dirname(__FILE__),"..","..","..","..","..","validation","veewee.feature")
-
-          features=Array.new
-          features[0]=feature_path
-          features[1]="--tags"
-          features[2]="@vmfusion"
-
-          begin
-            # The dup is to keep ARGV intact, so that tools like ruby-debug can respawn.
-            failure = Cucumber::Cli::Main.execute(features.dup)
-            Kernel.exit(failure ? 1 : 0)
-          rescue SystemExit => e
-            Kernel.exit(e.status)
-          rescue Exception => e
-            env.ui.error("#{e.message} (#{e.class})")
-            env.ui.error(e.backtrace.join("\n"))
-            Kernel.exit(1)
-          end
-
+          validate_tags( options['tags'],options)
         end
       end #Module
 

data/lib/veewee/provider/vmfusion/provider.rb

@@ -8,24 +8,28 @@ module Veewee
         #include ::Veewee::Provider::Vmfusion::ProviderCommand
 
         def check_requirements
-          fusion_version = :unknown
-
           require 'fission'
+
           if File.exists?("/Library/Application Support/VMware Fusion/vmrun")
-            fusion_version = "3.x"
             ::Fission.config.attributes["vmrun_bin"] = "/Library/Application Support/VMware Fusion/vmrun"
-          end
-
-          if File.exists?("/Applications/VMware Fusion.app/Contents/Library/vmrun")
-            fusion_version = "4.x"
+          elsif File.exists?("/Applications/VMware Fusion.app/Contents/Library/vmrun")
             ::Fission.config.attributes["vmrun_bin"] = "/Applications/VMware Fusion.app/Contents/Library/vmrun"
-          end
-
-          if fusion_version == :unknown
+          elsif
             raise Veewee::Error,"Could not find vmrun at standard locations. Probably you don't have Vmware fusion installed"
           end
+          env.logger.info("Found fusion version: #{fusion_version}")
         end
 
+        def fusion_version
+          # We ask the system profiler for all installed software
+          shell_results = shell_exec("system_profiler SPApplicationsDataType")
+
+          env.logger.info("Checking version by querying the system_profiler")
+          env.logger.debug(shell_results.stdout)
+
+          version = shell_results.stdout.split(/VMware/)[1].split(/\n/)[2].split(/:/)[1].strip
+          return version
+        end
 
       end #End Class
     end # End Module

data/lib/veewee/version.rb

@@ -4,5 +4,5 @@ end
 
 # Only set the version constant if it wasn't set before
 unless defined?(Veewee::VERSION)
-  ::Veewee::VERSION="0.3.0.beta1"
+  ::Veewee::VERSION="0.3.0.beta2"
 end

data/templates/CentOS-6.0-i386-netboot/base.sh

@@ -0,0 +1,14 @@
+# Base install
+
+sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
+
+cat > /etc/yum.repos.d/epel.repo << EOM
+[epel]
+name=epel
+baseurl=http://download.fedoraproject.org/pub/epel/6/\$basearch
+enabled=1
+gpgcheck=0
+EOM
+
+yum -y install gcc make gcc-c++ kernel-devel-`uname -r` zlib-devel openssl-devel readline-devel sqlite-devel perl wget
+

data/templates/CentOS-6.0-i386-netboot/chef.sh

@@ -0,0 +1,3 @@
+# Install Chef
+gem install --no-ri --no-rdoc chef
+

data/templates/CentOS-6.0-i386-netboot/cleanup.sh

@@ -0,0 +1,5 @@
+yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
+yum -y clean all
+rm -rf /etc/yum.repos.d/{puppetlabs,epel}.repo
+rm -rf VBoxGuestAdditions_*.iso
+

data/templates/CentOS-6.0-i386-netboot/definition.rb

@@ -1,16 +1,40 @@
-Veewee::Definition.declare({
-  :cpu_count => '1', :memory_size=> '392',
-  :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off', :ioapic => 'on', :pae => 'on',
-  :os_type_id => 'RedHat',
+Veewee::Session.declare({
+  :cpu_count => '1',
+  :memory_size=> '480',
+  :disk_size => '10140',
+  :disk_format => 'VDI',
+  :hostiocache => 'off',
+  :os_type_id => 'RedHat_64',
   :iso_file => "CentOS-6.0-i386-netinstall.iso",
   :iso_src => "http://vault.centos.org/6.0/isos/i386/CentOS-6.0-i386-netinstall.iso",
   :iso_md5 => "65731c29c49630dea6cde103d02ccffb",
   :iso_download_timeout => 1000,
-  :boot_wait => "15", :boot_cmd_sequence => [ '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],
-  :kickstart_port => "7122", :kickstart_timeout => 10000, :kickstart_file => "ks.cfg",
-  :ssh_login_timeout => "10000", :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "",
-  :ssh_host_port => "7222", :ssh_guest_port => "22",
+  :boot_wait => "15",
+  :boot_cmd_sequence => [
+    '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>'
+  ],
+  :kickstart_port => "7122",
+  :kickstart_timeout => 10000,
+  :kickstart_file => "ks.cfg",
+  :ssh_login_timeout => "10000",
+  :ssh_user => "veewee",
+  :ssh_password => "veewee",
+  :ssh_key => "",
+  :ssh_host_port => "7222",
+  :ssh_guest_port => "22",
   :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
   :shutdown_cmd => "/sbin/halt -h -p",
-  :postinstall_files => [ "postinstall.sh"], :postinstall_timeout => 10000
+  :postinstall_files => [
+    "base.sh",
+    "ruby.sh",
+    "chef.sh",
+    "puppet.sh",
+    "vagrant.sh",
+    "virtualbox.sh",
+    #"kvm.sh",
+    #"vmfusion.sh",
+    "cleanup.sh",
+    "zerodisk.sh"
+  ],
+  :postinstall_timeout => 10000
 })

data/templates/CentOS-6.0-i386-netboot/ks.cfg

@@ -1,13 +1,13 @@
 install
-url --url=http://be.mirror.eurid.eu/centos/6.0/os/i386/
+url --url=http://vault.centos.org/6.0/os/i386/
 lang en_US.UTF-8
 keyboard us
-network --bootproto dhcp
+network --bootproto=dhcp
 rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/
-firewall --enabled --trust eth0 --ssh
-authconfig --enableshadow --enablemd5
+firewall --enabled --service=ssh
+authconfig --enableshadow --passalgo=sha512
 selinux --disabled
-timezone Europe/Brussels
+timezone UTC
 bootloader --location=mbr
 
 text
@@ -17,37 +17,26 @@ zerombr
 clearpart --all --initlabel
 autopart
 
-auth --useshadow --enablemd5
+auth  --useshadow  --enablemd5
 firstboot --disabled
 reboot
 
-repo --name=epel --baseurl=http://download.fedoraproject.org/pub/epel/6/i386/ --includepkgs='ruby-augeas,ruby-shadow'
-repo --name=puppetlabs --baseurl=http://yum.puppetlabs.com/el/6/products/i386 --includepkgs='puppet,facter'
-
-%packages
-@ core
-ruby
-ruby-devel
-rubygems
-kernel-devel
-gcc
-gcc-c++
+%packages --ignoremissing
+@core
 bzip2
-make
-zlib-devel
-openssl-devel
-readline-devel
-sqlite-devel
-puppet
-facter
-
+kernel-devel
+kernel-headers
 -ipw2100-firmware
 -ipw2200-firmware
 -ivtv-firmware
+%end
 
 %post
-/usr/sbin/groupadd vagrant
-/usr/sbin/useradd vagrant -g vagrant -G wheel
-echo "vagrant"|passwd --stdin vagrant
-echo "vagrant        ALL=(ALL)       NOPASSWD: ALL" >> /etc/sudoers.d/vagrant
-chmod 0440 /etc/sudoers.d/vagrant
+/usr/bin/yum -y install sudo
+/usr/sbin/groupadd veewee
+/usr/sbin/useradd veewee -g veewee -G wheel
+echo "veewee"|passwd --stdin veewee
+echo "veewee        ALL=(ALL)       NOPASSWD: ALL" >> /etc/sudoers.d/veewee
+chmod 0440 /etc/sudoers.d/veewee
+%end
+

data/templates/CentOS-6.0-i386-netboot/puppet.sh

@@ -0,0 +1,12 @@
+# Install Puppet
+
+cat > /etc/yum.repos.d/puppetlabs.repo << EOM
+[puppetlabs]
+name=puppetlabs
+baseurl=http://yum.puppetlabs.com/el/6/products/\$basearch
+enabled=1
+gpgcheck=0
+EOM
+
+yum -y install puppet facter
+

data/templates/CentOS-6.0-i386-netboot/ruby.sh

@@ -0,0 +1,3 @@
+# Install Ruby
+yum -y install ruby ruby-devel rubygems
+

data/templates/CentOS-6.0-i386-netboot/vagrant.sh

@@ -0,0 +1,18 @@
+# Vagrant specific
+date > /etc/vagrant_box_build_time
+
+# Add vagrant user
+/usr/sbin/groupadd vagrant
+/usr/sbin/useradd vagrant -g vagrant -G wheel
+echo "vagrant"|passwd --stdin vagrant
+echo "vagrant        ALL=(ALL)       NOPASSWD: ALL" >> /etc/sudoers.d/vagrant
+chmod 0440 /etc/sudoers.d/vagrant
+
+# Installing vagrant keys
+mkdir -pm 700 /home/vagrant/.ssh
+wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O /home/vagrant/.ssh/authorized_keys
+chmod 0600 /home/vagrant/.ssh/authorized_keys
+chown -R vagrant /home/vagrant/.ssh
+
+# Customize the message of the day
+echo 'Welcome to your Vagrant-built virtual machine.' > /etc/motd