veewee 0.3.1 → 0.3.2

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

@@ -31,6 +31,15 @@ module Veewee
           end
         end
 
+        def add_winrm_nat_mapping
+
+          unless definition.nil?
+            #Map SSH Ports
+            command="#{@vboxcmd} modifyvm '#{name}' --natpf1 'guestwinrm,tcp,,#{definition.winrm_host_port},,#{definition.winrm_guest_port}'"
+            shell_exec("#{command}")
+          end
+        end
+
         def add_shared_folder
           command="#{@vboxcmd} sharedfolder add  \"#{name}\" --name \"veewee-validation\" --hostpath \"#{File.expand_path(env.validation_dir)}\" --automount"
           shell_exec("#{command}")
@@ -75,8 +84,7 @@ module Veewee
 
         end
 
-        def attach_disk
-
+        def attach_disk_common(storagectl, device_number)
           place=get_vbox_home
           location=name+"."+definition.disk_format.downcase
 
@@ -84,16 +92,23 @@ module Veewee
           ui.info "Attaching disk: #{location}"
 
           #command => "${vboxcmd} storageattach \"${vname}\" --storagectl \"SATA Controller\" --port 0 --device 0 --type hdd --medium \"${vname}.vdi\"",
-          command ="#{@vboxcmd} storageattach \"#{name}\" --storagectl \"SATA Controller\" --port 0 --device 0 --type hdd --medium \"#{location}\""
+          command ="#{@vboxcmd} storageattach \"#{name}\" --storagectl \"#{storagectl}\" --port 0 --device #{device_number} --type hdd --medium \"#{location}\""
           shell_exec("#{command}")
+        end
+
+        def attach_disk_ide(device_number=0)
+          self.attach_disk_common("IDE Controller", device_number)
+        end
 
+        def attach_disk_sata(device_number=0)
+          self.attach_disk_common("SATA Controller", device_number)
         end
 
 
-        def attach_isofile
+        def attach_isofile(device_number=0)
           full_iso_file=File.join(env.config.veewee.iso_dir,definition.iso_file)
           ui.info "Mounting cdrom: #{full_iso_file}"
-          command ="#{@vboxcmd} storageattach \"#{name}\" --storagectl \"IDE Controller\" --type dvddrive --port 0 --device 0 --medium \"#{full_iso_file}\""
+          command ="#{@vboxcmd} storageattach \"#{name}\" --storagectl \"IDE Controller\" --type dvddrive --port 0 --device #{device_number} --medium \"#{full_iso_file}\""
           shell_exec("#{command}")
         end
 

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

@@ -0,0 +1,31 @@
+module Veewee
+  module Provider
+    module Virtualbox
+      module BoxCommand
+
+        def winrm_options
+          port=definition.winrm_host_port
+          if self.exists?
+            forward=self.forwarding("guestwinrm")
+            unless forward.nil?
+              port=forward[:host_port]
+            end
+          end
+
+          winrm_options={
+            :user => definition.winrm_user,
+            :pass => definition.winrm_password,
+            :port => port,
+#            :port => (port.to_i+1).to_s, # debug, by running charles with a reverse proxy
+            :basic_auth_only => true,
+            :timeout => definition.winrm_login_timeout.to_i,
+            :operation_timeout => 600 # ten minutes
+          }
+          return winrm_options
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -13,20 +13,41 @@ module Veewee
 
           raise Veewee::Error,"Box is already running" if self.running?
 
-          # Before we start,correct the ssh port if needed
-          forward=self.forwarding("guestssh")
-          guessed_port=guess_free_port(definition.ssh_host_port.to_i,definition.ssh_host_port.to_i+40).to_s
-          definition.ssh_host_port=guessed_port.to_s
-
-          unless forward.nil?
-            if guessed_port!=forward[:guest_port]
-              # Remove the existing one
-              self.delete_forwarding("guestssh")
-              ui.warn "Changing ssh port from #{forward[:guest_port]} to #{guessed_port}"
-              self.add_ssh_nat_mapping
+          if definition.winrm_user && definition.winrm_password # prefer winrm 
+            # Before we start,correct the ssh/winrm port if needed
+            forward=self.forwarding("guestwinrm")
+            guessed_port=guess_free_port(definition.winrm_host_port.to_i,definition.winrm_host_port.to_i+40).to_s
+            definition.winrm_host_port=guessed_port.to_s
+            
+            unless forward.nil?
+              if guessed_port!=forward[:guest_port]
+                # Remove the existing one
+                self.delete_forwarding("guestwinrm")
+                env.ui.warn "Changing winrm port on UP from #{forward[:guest_port]} to #{guessed_port}"
+              self.add_winrm_nat_mapping
+              end
+            else
+              self.add_winrm_nat_mapping
             end
+            
           else
-            self.add_ssh_nat_mapping
+
+            # Before we start,correct the ssh port if needed
+            forward=self.forwarding("guestssh")
+            guessed_port=guess_free_port(definition.ssh_host_port.to_i,definition.ssh_host_port.to_i+40).to_s
+            definition.ssh_host_port=guessed_port.to_s
+            
+            unless forward.nil?
+              if guessed_port!=forward[:guest_port]
+                # Remove the existing one
+                self.delete_forwarding("guestssh")
+                env.ui.warn "Changing ssh port from #{forward[:guest_port]} to #{guessed_port}"
+              self.add_ssh_nat_mapping
+              end
+            else
+              self.add_ssh_nat_mapping
+            end
+            
           end
 
           self.suppress_messages

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

@@ -0,0 +1,13 @@
+module Veewee
+  module Provider
+    module Virtualbox
+      module BoxCommand
+
+        def winrm(command,options={})
+          super(command,options)
+        end
+
+      end
+    end
+  end
+end

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

@@ -5,6 +5,7 @@ require 'veewee/provider/core/helper/tcp'
 require 'veewee/provider/vmfusion/box/helper/status'
 require 'veewee/provider/vmfusion/box/helper/ip'
 require 'veewee/provider/vmfusion/box/helper/ssh_options'
+require 'veewee/provider/vmfusion/box/helper/winrm_options'
 require 'veewee/provider/vmfusion/box/helper/vnc'
 require 'veewee/provider/vmfusion/box/helper/console_type'
 require 'veewee/provider/vmfusion/box/helper/buildinfo'
@@ -19,6 +20,7 @@ require 'veewee/provider/vmfusion/box/ssh'
 require 'veewee/provider/vmfusion/box/template'
 require 'veewee/provider/vmfusion/box/validate_vmfusion'
 require 'veewee/provider/vmfusion/box/export_ova'
+require 'veewee/provider/vmfusion/box/add_share'
 
 
 module Veewee

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

@@ -0,0 +1,18 @@
+module Veewee
+  module Provider
+    module Vmfusion
+      module BoxCommand
+        # This function 'adds a share' the box based on the definition
+        def add_share(share_name, share_path)
+          shell_exec("#{(vmrun_cmd).shellescape} -T fusion addSharedFolder #{vmx_file_path.shellescape} '#{share_name}' #{::File.expand_path(share_path).shellescape}")
+        end
+
+        def add_share_from_defn
+          definition.add_shares.each do |share_name, share_path|
+            add_share(share_name, share_path)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+
+
 module Veewee
   module Provider
     module Vmfusion
@@ -5,8 +7,8 @@ module Veewee
 
         def build(options)
           super(options)
+          add_share_from_defn
         end
-
       end
     end
   end

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

@@ -43,16 +43,21 @@ module Veewee
           fusion_definition=definition.dup
 
           fusion_definition.os_type_id=fusion_os_type(definition.os_type_id)
-
+ 
           FileUtils.mkdir_p(vm_path)
           current_dir=FileUtils.pwd
           FileUtils.chdir(vm_path)
+       
+          unless definition.vmdk_file.nil?
+            src = "#{File.join(definition.path,definition.vmdk_file)}"
+            FileUtils.cp(src, vm_path)
+          end
+
           aFile = File.new(vmx_file_path, "w")
           aFile.write(vmx_template(fusion_definition))
           aFile.close
           FileUtils.chdir(current_dir)
         end
-
       end
     end
   end

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

@@ -40,12 +40,15 @@ module Veewee
           # When we get here, ssh is available and no postinstall scripts have been executed yet
           # So we begin by transferring the ISO file of the vmware tools
 
-          env.logger.info "About to transfer vmware tools iso buildinfo to the box #{name} - #{ip_address} - #{ssh_options}"
-          iso_image=guest_iso_path
-          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'"
+          if not (definition.winrm_user && definition.winrm_password)
+            # with windows, we just use the mounted volume
+            env.logger.info "About to transfer vmware tools iso buildinfo to the box #{name} - #{ip_address} - #{ssh_options}"
+            iso_image=guest_iso_path
+            if File.exists?(iso_image)
+              self.copy_to_box(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/helper/ip.rb

@@ -25,7 +25,7 @@ module Veewee
           raise ::Fission::Error,"VM #{name} does not exist" unless self.exists?
 
           unless mac_address.nil?
-            lease = Fission::Lease.all.data.find { |l| l.mac_address=mac_address}
+            lease = Fission::Lease.find_by_mac_address(mac_address).data
             return lease.ip_address unless lease.nil?
             return nil
           else

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

@@ -0,0 +1,21 @@
+module Veewee
+  module Provider
+    module Vmfusion
+      module BoxCommand
+
+        def winrm_options
+          winrm_options={
+            :user => definition.winrm_user,
+            :pass => definition.winrm_password,
+            :port => definition.winrm_host_port,
+            :basic_auth_only => true,
+            :timeout => definition.winrm_login_timeout.to_i,
+            :operation_timeout => 600 # ten minutes
+          }
+          return winrm_options
+        end
+
+      end
+    end
+  end
+end

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

@@ -17,14 +17,16 @@ module Veewee
         unless definition.floppy_files.nil?
           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
-
+        
+        puts definition.vmdk_file
+        vmdk_file = File.basename(definition.vmdk_file) unless definition.vmdk_file.nil?
         # Setup the variables for in the erb template
         data = {
           :cpu_count => definition.cpu_count, :memory_size => definition.memory_size,
@@ -35,7 +37,9 @@ module Veewee
           :mac_addres => "auto generated",
           :iso_file => "#{File.join(env.config.veewee.iso_dir,definition.iso_file)}",
           :box_name => name,
-          :vnc_port => guess_vnc_port
+          :vnc_port => guess_vnc_port,
+          :fusion_version => @provider.fusion_version,
+          :vmdk_file => vmdk_file
         }
 
         vars = ErbBinding.new(data)

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

@@ -82,3 +82,9 @@ ethernet0.displayName = "Ethernet"
 sound.startConnected = "FALSE"
 RemoteDisplay.vnc.enabled = "TRUE"
 RemoteDisplay.vnc.port = "<%= vnc_port %>"
+<% if fusion_version.start_with?('5.') %>bios.bootOrder = "hdd,CDROM"<% end %>
+<% unless vmdk_file.nil? %>
+scsi0:2.present = "TRUE"
+scsi0:2.fileName = "<%= vmdk_file %>"
+scsi0:2.redo = ""
+<% end %>

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

@@ -0,0 +1,12 @@
+module Veewee
+  module Provider
+    module Vmfusion
+      module BoxCommand
+
+        def winrm(command,options = {})
+          super(command,options)
+        end
+      end
+    end
+  end
+end

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

@@ -27,7 +27,13 @@ module Veewee
           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
+          if (shell_results.stdout == "")
+            ui.warn "Could not detect the exact version of vmware. assuming 5.1"
+            version = "5.1"
+          else
+            version = shell_results.stdout.split(/VMware/)[1].split(/\n/)[2].split(/:/)[1].strip
+          end
+
           return version
         end
 

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.1"
+  ::Veewee::VERSION="0.3.2"
 end

data/templates/CentOS-5.6-x86_64-netboot-packages/definition.rb

@@ -0,0 +1,16 @@
+Veewee::Definition.declare({
+  :cpu_count => '1', :memory_size=> '384',
+  :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off', :ioapic => 'on', :pae => 'on',
+  :os_type_id => 'RedHat_64',
+  :iso_file => "CentOS-5.6-x86_64-netinstall.iso",
+  :iso_src => "http://vault.centos.org/5.6/isos/x86_64/CentOS-5.6-x86_64-netinstall.iso",
+  :iso_md5 => "02cf3a5e32aaa5eed27af775ad292beb",
+  :iso_download_timeout => 1000,
+  :boot_wait => "10", :boot_cmd_sequence => [ 'linux 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",
+  :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
+  :shutdown_cmd => "/sbin/halt -h -p",
+  :postinstall_files => [ "postinstall.sh"], :postinstall_timeout => 10000
+})

data/templates/CentOS-5.6-x86_64-netboot-packages/ks.cfg

@@ -0,0 +1,47 @@
+# Kickstart file automatically generated by anaconda.
+
+install
+url --url=http://vault.centos.org/5.6/os/x86_64
+lang en_US.UTF-8
+langsupport --default=en_US.UTF-8 en_US.UTF-8
+keyboard us
+xconfig --card "VMWare" --videoram 16384 --hsync 31.5-37.9 --vsync 50-70 --resolution 800x600 --depth 16
+network --device eth0 --bootproto dhcp
+rootpw --iscrypted $1$vSG8FjAu$ekQ0grf16hS4G93HTPcco/
+firewall --enabled --trust eth0 --ssh
+selinux --enforcing
+authconfig --enableshadow --enablemd5
+timezone Europe/London
+bootloader --location=mbr
+# The following is the partition information you requested
+# Note that any partitions you deleted are not expressed
+# here so unless you clear all partitions first, this is
+# not guaranteed to work
+clearpart --all --drives=sda --initlabel
+part /boot --fstype ext3 --size=100 --ondisk=sda
+part pv.2 --size=0 --grow --ondisk=sda
+volgroup VolGroup00 --pesize=32768 pv.2
+logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=528 --grow --maxsize=1056
+logvol / --fstype ext3 --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
+reboot
+
+%packages
+#@ admin-tools
+#@ text-internet
+#@ dialup
+#@ smb-server
+#@ web-server
+#@ printing
+#@ server-cfg
+@ core
+grub
+e2fsprogs
+lvm2
+kernel
+kernel-devel
+
+%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

data/templates/CentOS-5.6-x86_64-netboot-packages/postinstall.sh

@@ -0,0 +1,61 @@
+# based on http://chrisadams.me.uk/2010/05/10/setting-up-a-centos-base-box-for-development-and-testing-with-vagrant/
+# but with all the source building moved to packages & puppet focussed
+
+date > /etc/vagrant_box_build_time
+
+fail()
+{
+  echo "FATAL: $*"
+  exit 1
+}
+
+#kernel source is needed for vbox additions
+yum -y install gcc bzip2 make 
+# kernel-devel-`uname -r` is now installed in the KS to ensure we get matching kernel & kernel-devel on the first boot
+#yum -y update
+#yum -y upgrade
+
+yum -y install gcc-c++ zlib-devel openssl-devel readline-devel sqlite3-devel
+yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
+
+# puppet 
+rpm -ivh http://yum.puppetlabs.com/el/5/products/i386/puppetlabs-release-5-6.noarch.rpm
+yum -y install puppet-2.6.10
+
+# chef, via gem
+#yum install ruby ruby-devel ruby-ri ruby-rdoc ruby-shadow gcc gcc-c++ automake autoconf make curl dmidecode
+#gem install chef --no-ri --no-rdoc
+
+# chef, via rpms (I'm not sure how sane this is, it installs lots of rubygem-xxx packages)
+rpm -Uvh http://rbel.co/rbel5
+yum -y install rubygem-chef
+
+# clean up yum meta data cache
+yum -y clean all
+
+#Installing vagrant keys
+mkdir /home/vagrant/.ssh
+chmod 700 /home/vagrant/.ssh
+cd /home/vagrant/.ssh
+wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O authorized_keys
+chown -R vagrant /home/vagrant/.ssh
+
+#Installing the virtualbox guest additions
+VBOX_VERSION=$(cat /home/vagrant/.vbox_version)
+cd /tmp
+wget http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso
+mount -o loop VBoxGuestAdditions_$VBOX_VERSION.iso /mnt
+sh /mnt/VBoxLinuxAdditions.run
+umount /mnt
+
+rm VBoxGuestAdditions_$VBOX_VERSION.iso
+
+
+sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
+sed -i "s/^\(.*env_keep = \"\)/\1PATH /" /etc/sudoers
+
+# Zero out the free space to save space in the final image:
+dd if=/dev/zero of=/EMPTY bs=1M
+rm -f /EMPTY
+
+exit