Merge branch 'master' of github.com:jedi4ever/veewee

mpapis · mpapis · commit 648535ac727b · 2014-10-15T04:17:14.000+02:00
diff --git a/lib/veewee/provider/core/box/ssh.rb b/lib/veewee/provider/core/box/ssh.rb
@@ -15,7 +15,7 @@ def ssh(command=nil,options={})
 
           if (options[:interactive]==true)
             unless host_ip.nil? || host_ip==""
-              ssh_command="ssh #{ssh_commandline_options(options)} #{host_ip} #{Shellwords.escape command}"
+              ssh_command="ssh #{ssh_commandline_options(options)} #{host_ip} #{Shellwords.escape(command) if command}"
 
               fg_exec(ssh_command,options)
 
@@ -43,10 +43,10 @@ def ssh_commandline_options(options)
           ]
           if definition.ssh_key
             command_options << "-o IdentitiesOnly=yes"
-            ssh_keys = ssh_key_to_a(ssh_key)
+            ssh_keys = ssh_key_to_a(definition.ssh_key)
             ssh_keys.each do |ssh_keys|
               # Filenames of SSH keys are relative to their definition
-              ssh_key = Pathname.new(definition.ssh_key)
+              ssh_key = Pathname.new(ssh_keys)
               ssh_key = File.join(definition.path, ssh_key) if ssh_key.relative?
               command_options << "-i #{ssh_key}"
             end
diff --git a/templates/ubuntu-13.04-minimal-i386-rvm/definition.rb b/templates/ubuntu-13.04-minimal-i386-rvm/definition.rb
@@ -0,0 +1,35 @@
+Veewee::Session.declare({
+  :cpu_count => '1',
+  :memory_size=> '1024',
+  :disk_size => '10140',
+  :disk_format => 'VDI',
+  :hostiocache => 'off',
+  :os_type_id => 'Ubuntu',
+  :iso_file => "ubuntu-13.04-mini-i386.iso",
+  :iso_src => "http://archive.ubuntu.com/ubuntu/dists/raring/main/installer-i386/current/images/netboot/mini.iso",
+  :iso_md5 => 'a8f31cd33629c43d711d95bcb21ed9d8',
+  :iso_download_timeout => "1000",
+  :boot_wait => "4",
+  :boot_cmd_sequence => [
+    '<Esc><Esc>',
+    'linux vga=788 noapic preseed/url=http://%IP%:%PORT%/preseed.cfg ',
+    'debian-installer=en_US auto locale=en_US kbd-chooser/method=us ',
+    'hostname=%NAME% ',
+    'fb=false debconf/frontend=noninteractive ',
+    'keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA keyboard-configuration/variant=USA console-setup/ask_detect=false ',
+    'initrd=initrd.gz -- quiet <Enter>'
+],
+  :kickstart_port => "7122",
+  :kickstart_timeout => "10000",
+  :kickstart_file => "preseed.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 => "shutdown -P now",
+  :postinstall_files => [ "postinstall.sh"],
+  :postinstall_timeout => "10000"
+})
diff --git a/templates/ubuntu-13.04-minimal-i386-rvm/postinstall.sh b/templates/ubuntu-13.04-minimal-i386-rvm/postinstall.sh
@@ -0,0 +1,84 @@
+# postinstall.sh created from Mitchell's official lucid32/64 baseboxes
+
+date > /etc/vagrant_box_build_time
+
+
+# Apt-install various things necessary for Ruby, guest additions,
+# etc., and remove optional things to trim down the machine.
+apt-get -y update
+apt-get -y upgrade
+apt-get -y install linux-headers-$(uname -r) build-essential
+apt-get -y install zlib1g-dev libssl-dev libreadline-gplv2-dev libyaml-dev
+apt-get -y install wget curl mc p7zip-full
+apt-get clean
+
+# Installing the virtualbox guest additions
+apt-get -y install dkms
+VBOX_VERSION=$(cat /home/vagrant/.vbox_version)
+mount -o loop VBoxGuestAdditions_$VBOX_VERSION.iso /mnt
+sh /mnt/VBoxLinuxAdditions.run
+umount /mnt
+
+rm VBoxGuestAdditions_$VBOX_VERSION.iso
+
+cd /tmp
+
+echo progress-bar >> /home/vagrant/.curlrc
+chown vagrant:vagrant /home/vagrant/.curlrc
+
+# Setup sudo to allow no-password sudo for "admin"
+groupadd -r admin
+usermod -a -G admin vagrant
+cp /etc/sudoers /etc/sudoers.orig
+sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers
+sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers
+
+# Add puppet user and group
+#adduser --system --group --home /var/lib/puppet puppet
+
+# Install NFS client
+apt-get -y install nfs-common
+
+# Install RVM and Ruby.
+curl -L https://get.rvm.io | bash -s head --ruby
+/etc/profile.d/rvm.sh
+/usr/local/rvm/bin/rvm use ruby --default
+usermod -a -G rvm vagrant
+/usr/local/rvm/bin/gem update --system
+/usr/local/rvm/bin/gem update
+
+# Installing chef & Puppet
+/usr/local/rvm/bin/gem install chef --no-ri --no-rdoc
+/usr/local/rvm/bin/gem install puppet --no-ri --no-rdoc
+
+# 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
+chmod 600 /home/vagrant/.ssh/authorized_keys
+chown -R vagrant /home/vagrant/.ssh
+
+# Remove items used for building, since they aren't needed anymore
+apt-get -y remove linux-headers-$(uname -r) build-essential
+apt-get -y autoremove
+
+# Zero out the free space to save space in the final image:
+dd if=/dev/zero of=/EMPTY bs=1M
+rm -f /EMPTY
+
+# Removing leftover leases and persistent rules
+echo "cleaning up dhcp leases"
+rm /var/lib/dhcp/*
+
+# Make sure Udev doesn't block our network
+# http://6.ptmc.org/?p=164
+echo "cleaning up udev rules"
+rm /etc/udev/rules.d/70-persistent-net.rules
+mkdir /etc/udev/rules.d/70-persistent-net.rules
+rm -rf /dev/.udev/
+rm /lib/udev/rules.d/75-persistent-net-generator.rules
+
+echo "Adding a 2 sec delay to the interface up, to make the dhclient happy"
+echo "pre-up sleep 2" >> /etc/network/interfaces
+exit
diff --git a/templates/ubuntu-13.04-minimal-i386-rvm/preseed.cfg b/templates/ubuntu-13.04-minimal-i386-rvm/preseed.cfg
@@ -0,0 +1,93 @@
+## Options to set on the command line
+d-i debian-installer/locale string en_US.utf8
+d-i console-setup/ask_detect boolean false
+d-i console-setup/layout string us
+
+#d-i netcfg/get_hostname string dummy
+d-i netcfg/get_hostname string unassigned-hostname
+d-i netcfg/get_domain string unassigned-domain
+
+# Continue without a default route
+# Not working , specify a dummy in the DHCP
+#d-i netcfg/no_default_route boolean
+
+d-i time/zone string UTC
+d-i clock-setup/utc-auto boolean true
+d-i clock-setup/utc boolean true
+
+d-i kbd-chooser/method select American English
+
+d-i netcfg/wireless_wep string
+
+d-i base-installer/kernel/override-image string linux-server
+#d-i base-installer/kernel/override-image string linux-image-2.6.32-21-generic
+
+# Choices: Dialog, Readline, Gnome, Kde, Editor, Noninteractive
+d-i debconf debconf/frontend select Noninteractive
+
+d-i pkgsel/install-language-support boolean false
+tasksel tasksel/first multiselect standard, ubuntu-server
+
+#d-i partman-auto/method string regular
+d-i partman-auto/method string lvm
+#d-i partman-auto/purge_lvm_from_device boolean true
+
+d-i partman-lvm/confirm boolean true
+d-i partman-lvm/device_remove_lvm boolean true
+d-i partman-auto/choose_recipe select atomic
+
+d-i partman/confirm_write_new_label boolean true
+d-i partman/confirm_nooverwrite boolean true
+d-i partman/choose_partition select finish
+d-i partman/confirm boolean true
+
+#http://ubuntu-virginia.ubuntuforums.org/showthread.php?p=9626883
+#Message: "write the changes to disk and configure lvm preseed"
+#http://serverfault.com/questions/189328/ubuntu-kickstart-installation-using-lvm-waits-for-input
+#preseed partman-lvm/confirm_nooverwrite boolean true
+
+# Write the changes to disks and configure LVM?
+d-i partman-lvm/confirm boolean true
+d-i partman-lvm/confirm_nooverwrite boolean true
+d-i partman-auto-lvm/guided_size string max
+
+## Default user, we can get away with a recipe to change this
+d-i passwd/user-fullname string vagrant
+d-i passwd/username string vagrant
+d-i passwd/user-password password vagrant
+d-i passwd/user-password-again password vagrant
+d-i user-setup/encrypt-home boolean false
+d-i user-setup/allow-password-weak boolean true
+
+## minimum is puppet and ssh and ntp
+# Individual additional packages to install
+d-i pkgsel/include string openssh-server ntp
+
+# Whether to upgrade packages after debootstrap.
+# Allowed values: none, safe-upgrade, full-upgrade
+d-i pkgsel/upgrade select full-upgrade
+
+d-i grub-installer/only_debian boolean true
+d-i grub-installer/with_other_os boolean true
+d-i finish-install/reboot_in_progress note
+
+#For the update
+d-i pkgsel/update-policy select none
+
+# debconf-get-selections --install
+#Use mirror
+#d-i apt-setup/use_mirror boolean true
+#d-i mirror/country string manual
+#choose-mirror-bin mirror/protocol string http
+#choose-mirror-bin mirror/http/hostname string 192.168.4.150
+#choose-mirror-bin mirror/http/directory string /ubuntu
+#choose-mirror-bin mirror/suite select maverick
+#d-i debian-installer/allow_unauthenticated string true
+
+choose-mirror-bin mirror/http/proxy string
+
+d-i mirror/country string manual
+d-i mirror/http/hostname string archive.ubuntu.com
+d-i mirror/http/directory string /ubuntu
+d-i mirror/proxy string
+d-i mirror/http/mirror select us.archive.ubuntu.com
diff --git a/templates/windows-2012-serverstandard-amd64/Autounattend.xml b/templates/windows-2012-serverstandard-amd64/Autounattend.xml
@@ -37,7 +37,8 @@
 
             <UserData>
               <!-- Product Key from http://technet.microsoft.com/en-us/library/ff793406.aspx -->
-                <ProductKey>YC6KT-GKW9T-YTKYR-T4X34-R7VHC
+                <ProductKey>
+                    <Key>YC6KT-GKW9T-YTKYR-T4X34-R7VHC</Key>
                     <WillShowUI>Never</WillShowUI>
                 </ProductKey>
 
diff --git a/templates/windows-2012R2-serverdatacenter-amd64/Autounattend.xml b/templates/windows-2012R2-serverdatacenter-amd64/Autounattend.xml
@@ -37,7 +37,8 @@
 
             <UserData>
               <!-- Product Key from http://technet.microsoft.com/en-us/library/ff793406.aspx -->
-                <ProductKey>W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9
+                <ProductKey>
+                    <Key>W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9</Key>
                     <WillShowUI>Never</WillShowUI>
                 </ProductKey>
 
