veewee 0.3.6 → 0.3.7

data/lib/veewee/template.rb

@@ -3,20 +3,20 @@ module Veewee
 
     attr_accessor :env
 
-    attr_reader :name,:path
+    attr_reader :name, :path
 
-    def initialize(name,path,env)
-      @name=name
-      @path=path
-      @env=env
+    def initialize(name, path, env)
+      @name = name
+      @path = path
+      @env = env
       return self
     end
 
     def exists?
-      filename=Dir.glob("#{path}/definition.rb")
-      if filename.length!=0
-          env.logger.debug("[Template] template '#{name}' is valid")
-          return true
+      filename = Dir.glob("#{path}/definition.rb")
+      if filename.length != 0
+        env.logger.debug("[Template] template '#{name}' is valid")
+        return true
       else
         return false
       end

data/lib/veewee/templates.rb

@@ -4,16 +4,16 @@ module Veewee
     attr_accessor :env
 
     def initialize(env)
-      @env=env
+      @env = env
       return self
     end
 
     def [](name)
-      result=nil
+      result = nil
       valid_paths(env.template_path).each do |template_dir|
-        template=Veewee::Template.new(name,File.join(template_dir,name),@env)
+        template = Veewee::Template.new(name, File.join(template_dir, name), @env)
         if template.exists?
-          result=template
+          result = template
           return result
         end
       end
@@ -22,37 +22,38 @@ module Veewee
 
     # Fetch all Templates
     def each(&block)
-      templates=Hash.new
+      templates = Hash.new
 
       valid_paths(env.template_path).each do |template_dir|
 
         env.logger.debug("[Template] Searching #{template_dir} for templates")
 
-        subdirs=Dir.glob("#{template_dir}/*")
+        subdirs = Dir.glob("#{template_dir}/*")
         subdirs.each do |sub|
           if File.directory?("#{sub}")
-            name=sub.sub(/#{template_dir}\//,'')
-            template=Veewee::Template.new(name,sub,@env)
+            name = sub.sub(/#{template_dir}\//, '')
+            template = Veewee::Template.new(name, sub, @env)
             if template.exists?
-                env.logger.debug("[Template] template '#{name}' found")
-              templates[name]=template
+              env.logger.debug("[Template] template '#{name}' found")
+              templates[name] = template
             end
           end
         end
       end
 
-      if templates.length==0
-        env.logger.debug("[Template] no templates found") 
+      if templates.length == 0
+        env.logger.debug("[Template] no templates found")
       end
 
       Hash[templates.sort].each(&block)
     end
 
     private
+
     # Traverses path to see which exist or not
     # and checks if available
     def valid_paths(paths)
-      valid_paths=paths.collect { |path|
+      valid_paths = paths.collect { |path|
         if File.exists?(path) && File.directory?(path)
           env.logger.info "Path #{path} exists"
           File.expand_path(path)
@@ -64,7 +65,5 @@ module Veewee
       return valid_paths.compact
     end
 
-
-
   end
 end

data/lib/veewee/ui.rb

@@ -13,7 +13,7 @@ module Veewee
 
     [:warn, :error, :info, :success].each do |method|
       define_method(method) do |message, *argv|
-        opts , *argv = argv
+        opts, *argv = argv
         opts ||= {}
         # Log normal console messages
         env.logger.info("ui") { message }
@@ -36,7 +36,7 @@ module Veewee
 
       [[:warn, :yellow], [:error, :red], [:info, nil], [:success, :green]].each do |method, color|
         class_eval <<-CODE
-          def #{method}(message, opts=nil)
+          def #{method}(message, opts = nil)
             super(message)
             opts ||= {}
             opts[:new_line] = true if !opts.has_key?(:new_line)
@@ -47,7 +47,7 @@ module Veewee
 
       [:ask, :no?, :yes?].each do |method|
         class_eval <<-CODE
-          def #{method}(message, opts=nil)
+          def #{method}(message, opts = nil)
             super(message)
             opts ||= {}
             @shell.send(#{method.inspect}, format_message(message, opts), opts[:color])
@@ -55,7 +55,7 @@ module Veewee
         CODE
       end
 
-      def report_progress(progress, total, show_parts=true)
+      def report_progress(progress, total, show_parts = true)
         percent = (progress.to_f / total.to_f) * 100
         line = "Progress: #{percent.to_i}%"
         line << " (#{progress} / #{total})" if show_parts
@@ -69,10 +69,10 @@ module Veewee
 
       protected
 
-      def format_message(message, opts=nil)
+      def format_message(message, opts = nil)
         opts = { :prefix => true }.merge(opts || {})
-        opts[:prefix]=false if env.resource=="veewee"
-        opts[:prefix]=false if env.resource=="vagrant"
+        opts[:prefix] = false if env.resource == "veewee"
+        opts[:prefix] = false if env.resource == "vagrant"
         message = "[#{env.resource}] #{message}" if opts[:prefix]
         message
       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.6"
+  ::Veewee::VERSION="0.3.7"
 end

data/templates/CentOS-6.3-i386-minimal/base.sh

@@ -10,5 +10,5 @@ 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
+yum -y install gcc make gcc-c++ kernel-devel-`uname -r` zlib-devel openssl-devel readline-devel sqlite-devel perl wget dkms
 

data/templates/CentOS-6.3-i386-minimal/definition.rb

@@ -1,10 +1,19 @@
+# sudo acpid and wget are not included in the minimal DVD ISO. To fix
+# this, use the *bin* ISO or run "yum install ..." in %post
 Veewee::Session.declare({
   :cpu_count => '1',
   :memory_size=> '480',
   :disk_size => '10140',
   :disk_format => 'VDI',
-  :hostiocache => 'off',
-  :os_type_id => 'RedHat_64',
+  :hostiocache => 'on',
+  :os_type_id => 'RedHat',
+  :virtualbox => { :vm_options => [ 
+                                   'hwvirtex' => 'off',
+                                   'hwvirtexexcl' => 'off',
+                                   'nestedpaging' => 'off',
+                                   'natdnshostresolver1' => 'on'
+                                  ]
+                          },
   :iso_file => "CentOS-6.3-i386-minimal.iso",
   :iso_src => "http://www.mirrorservice.org/sites/mirror.centos.org/6.3/isos/i386/CentOS-6.3-i386-minimal.iso",
   :iso_md5 => "081ce8ba3e9f761a35d47f1c345562c1",
@@ -17,8 +26,8 @@ Veewee::Session.declare({
   :kickstart_timeout => 10000,
   :kickstart_file => "ks.cfg",
   :ssh_login_timeout => "10000",
-  :ssh_user => "veewee",
-  :ssh_password => "veewee",
+  :ssh_user => "vagrant",
+  :ssh_password => "vagrant",
   :ssh_key => "",
   :ssh_host_port => "7222",
   :ssh_guest_port => "22",

data/templates/CentOS-6.3-i386-minimal/ks.cfg

@@ -21,22 +21,58 @@ auth  --useshadow  --enablemd5
 firstboot --disabled
 reboot
 
-%packages --ignoremissing
+%packages --nobase --excludedocs --instLangs=en
 @core
 bzip2
-kernel-devel
-kernel-headers
--ipw2100-firmware
--ipw2200-firmware
--ivtv-firmware
-%end
+-aic94xx-firmware.noarch
+-atmel-firmware.noarch
+-b43-openfwwf.noarch
+-bfa-firmware.noarch
+-ipw2100-firmware.noarch
+-ipw2200-firmware.noarch
+-ivtv-firmware.noarch
+-iwl1000-firmware.noarch
+-iwl100-firmware.noarch
+-iwl3945-firmware.noarch
+-iwl4965-firmware.noarch
+-iwl5000-firmware.noarch
+-iwl5150-firmware.noarch
+-iwl6000-firmware.noarch
+-iwl6000g2a-firmware.noarch
+-iwl6000g2b-firmware.noarch
+-iwl6050-firmware.noarch
+-libertas-usb8388-firmware.noarch
+-ql2100-firmware.noarch
+-ql2200-firmware.noarch
+-ql23xx-firmware.noarch
+-ql2400-firmware.noarch
+-ql2500-firmware.noarch
+-rt61pci-firmware.noarch
+-rt73usb-firmware.noarch
+-xorg-x11-drv-ati-firmware.noarch
+-zd1211-firmware.noarch
 
 %post
-/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
+date > /etc/vagrant_box_build_time
+
+/usr/bin/yum -y install acpid sudo wget bind-utils
+
+/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
 
+mkdir -p /home/vagrant/.ssh
+wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O /home/vagrant/.ssh/authorized_keys
+chown -R vagrant /home/vagrant/.ssh
+chgrp -R vagrant /home/vagrant/.ssh
+chmod -R go= /home/vagrant/.ssh
+
+# Make ssh faster by not waiting on DNS
+echo "UseDNS no" >> /etc/ssh/sshd_config
+
+# show boot-time messages
+sed -i'' -e's/ rhgb quiet//' /boot/grub/grub.conf 
+
+%end

data/templates/CentOS-6.3-i386-minimal/virtualbox.sh

@@ -1,8 +1,8 @@
 # Installing the virtualbox guest additions
-VBOX_VERSION=$(cat /home/veewee/.vbox_version)
+VBOX_VERSION=$(cat /home/vagrant/.vbox_version)
 cd /tmp
-mount -o loop /home/veewee/VBoxGuestAdditions_$VBOX_VERSION.iso /mnt
+mount -o loop /home/vagrant/VBoxGuestAdditions_$VBOX_VERSION.iso /mnt
 sh /mnt/VBoxLinuxAdditions.run
 umount /mnt
-rm -rf /home/veewee/VBoxGuestAdditions_*.iso
+rm -rf /home/vagrant/VBoxGuestAdditions_*.iso
 

data/templates/CentOS-6.3-x86_64-minimal/base.sh

@@ -10,5 +10,5 @@ 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
+yum -y install gcc make gcc-c++ kernel-devel-`uname -r` zlib-devel openssl-devel readline-devel sqlite-devel perl wget dkms
 

data/templates/CentOS-6.3-x86_64-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 dkms
+

data/templates/CentOS-6.3-x86_64-netboot/chef.sh

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

data/templates/CentOS-6.3-x86_64-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.3-x86_64-netboot/definition.rb

@@ -0,0 +1,40 @@
+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.3-x86_64-netinstall.iso",
+  :iso_src => "http://www.mirrorservice.org/sites/mirror.centos.org/6.3/isos/x86_64/CentOS-6.3-x86_64-netinstall.iso",
+  :iso_md5 => "690138908de516b6e5d7d180d085c3f3",
+  :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 => "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 => [
+    "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.3-x86_64-netboot/ks.cfg

@@ -0,0 +1,41 @@
+install
+url --url=http://www.mirrorservice.org/sites/mirror.centos.org/6.3/os/x86_64/
+lang en_US.UTF-8
+keyboard us
+network --bootproto=dhcp
+rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/
+firewall --enabled --service=ssh
+authconfig --enableshadow --passalgo=sha512
+selinux --disabled
+timezone UTC
+bootloader --location=mbr
+
+text
+skipx
+zerombr
+
+clearpart --all --initlabel
+autopart
+
+auth  --useshadow  --enablemd5
+firstboot --disabled
+reboot
+
+%packages --ignoremissing
+@core
+bzip2
+kernel-devel
+kernel-headers
+-ipw2100-firmware
+-ipw2200-firmware
+-ivtv-firmware
+%end
+
+%post
+/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.3-x86_64-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.3-x86_64-netboot/ruby.sh

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

data/templates/CentOS-6.3-x86_64-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