le1t0-deprec 2.1.6.057 → 2.1.6.058

data/lib/deprec/recipes/xen.rb

@@ -1,11 +1,3 @@
-def handle_xen_images(&block)
-  do_xen_images = (ENV['ONLY'] || '').split(',')
-  xen_images.each do |xen_image|
-    next if do_xen_images.size > 0 && !do_xen_images.include?(xen_image[:hostname])
-    yield(xen_image)
-  end
-end
-
 # Copyright 2006-2010 by Mike Bailey, le1t0@github. All rights reserved.
 Capistrano::Configuration.instance(:must_exist).load do 
   namespace :deprec do
@@ -23,7 +15,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       #     :swap => '2Gb',
       #     :ip => '10.0.2.1',
       #     :mac => '00:16:3e:00:00:01',
-      #     :vcups => 3, # specify amount of vcpus to use, this will be put in the VM config in /etc/xen/
+      #     :vcpus => 3, # specify amount of vcpus to use, this will be put in the VM config in /etc/xen/
       #     :cpus => '1,3,6', # specify list of cpus to use, this will be put in the VM config in /etc/xen/
       #     :arch => 'i386' # specify to create an i386 VM if you have a x86_64 host for example; optional.
       #   },
@@ -37,7 +29,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       #     :swap => '2Gb',
       #     :ip => '10.0.2.1',
       #     :mac => '00:16:3e:00:00:01',
-      #     :vcups => 3, # specify amount of vcpus to use, this will be put in the VM config in /etc/xen/
+      #     :vcpus => 3, # specify amount of vcpus to use, this will be put in the VM config in /etc/xen/
       #     :cpus => '1,3,6', # specify list of cpus to use, this will be put in the VM config in /etc/xen/
       #   } 
       # ]
@@ -251,46 +243,122 @@ Capistrano::Configuration.instance(:must_exist).load do
       # The images to create are matched on the :hostname value in :xen_images
       desc "Create Xen images"
       task :create_images, :roles => :dom0 do
-        handle_xen_images do |xen_image|
-          args = []
-          vcpus = xen_image.delete(:vcpus)
-          cpus = xen_image.delete(:cpus)
-          xen_image.each do |k,v|
-            args << "--#{k}='#{v}'"
+        do_xen_images = (ENV['ONLY'] || '').split(',')
+        xen_images_list = {}
+        find_servers.collect { |server| server.host }.each do |host|
+          scope host do
+            xen_images_list[host] = (xen_images || []).collect do |xen_image|
+                args = ([xen_image[:hostname]] + xen_image.collect do |k,v|
+                  "--#{k}=#{v}" unless [ :vcpus, :cpus ].include?(k)
+                end.compact).join(' ')
+                cpus = [xen_image[:hostname], xen_image[:vcpus] || 1, xen_image[:cpus]].compact.join(' ')
+                do_xen_images.size == 0 || do_xen_images.include?(xen_image[:hostname]) ? [ args, cpus ] : nil
+              end.compact
           end
-          cmd = "sh -c \"[ -e /etc/xen/#{xen_image[:hostname]}.cfg ] || /usr/bin/xen-create-image #{args.join(' ')}\""
-          sudo cmd
-          deprec2.append_to_file_if_missing("/etc/xen/#{xen_image[:hostname]}.cfg", "vcpus = '#{vcpus}'") unless vcpus.nil?
-          deprec2.append_to_file_if_missing("/etc/xen/#{xen_image[:hostname]}.cfg", "cpus = '#{cpus}'") unless cpus.nil?
         end
+
+        std.su_put "", tmpfile_xi = "/tmp/xen_images.#{Time.now.strftime("%Y%m%d%H%M%S")}.txt", '/tmp/', :mode=>0644, :proc => Proc.new { |from, host|
+          image_list = xen_images_list[host].collect { |ar| ar[0] }.join("\n").strip
+          image_list.empty? ? image_list : image_list + "\n"
+        }
+        std.su_put "", tmpfile_xc = "/tmp/xen_cpus.#{Time.now.strftime("%Y%m%d%H%M%S")}.txt", '/tmp/', :mode=>0644, :proc => Proc.new { |from, host|
+          image_list = xen_images_list[host].collect { |ar| ar[1] }.join("\n").strip
+          image_list.empty? ? image_list : image_list + "\n"
+        }
+
+        run <<-EOF
+          cat #{tmpfile_xi} | while read xen_image opts ; do {
+            [ -e /etc/xen/${xen_image}.cfg -o -z "${xen_image}" ] || echo sudo /usr/bin/xen-create-image ${opts} ;
+            [ -e /etc/xen/${xen_image}.cfg -o -z "${xen_image}" ] || sudo /usr/bin/xen-create-image ${opts} ;
+          } ; done
+EOF
+        run <<-EOF
+          cat #{tmpfile_xc} | while read xen_image vcpus cpus ; do {
+            tmpfile="/tmp/.${xen_image}.xen_config.$(date +"%Y%m%d%H%M%S").txt" ;
+            [ -z "${vcpus}" -a -z "${cpus}" ] || cat /etc/xen/${xen_image}.cfg > ${tmpfile} ;
+            [ -z "${vcpus}" -a -z "${cpus}" ] || echo >> ${tmpfile} ;
+            [ -z "${vcpus}" ] || echo "vcpus = '${vcpus}'" >> ${tmpfile} ;
+            [ -z "${cpus}" ] || echo "cpus = '${cpus}'" >> ${tmpfile} ;
+            [ -z "${vcpus}" -a -z "${cpus}" ] || sudo mv ${tmpfile} /etc/xen/${xen_image}.cfg ;
+          } ; done
+EOF
+        sudo "rm -f #{tmpfile_xi} #{tmpfile_xc}"
         top.deprec.xen.auto_start_images
       end
 
       # Same explanation as for create_images, but in this case for registering images to be auto-started at host sys boot up
       desc "Make links for xen image configs to be started automatically"
       task :auto_start_images, :roles => :dom0 do
-        handle_xen_images do |xen_image|
-          cmd = "sh -c \"ln -nsf /etc/xen/#{xen_image[:hostname]}.cfg /etc/xen/auto/#{xen_image[:hostname]}.cfg\""
-          sudo cmd
+        do_xen_images = (ENV['ONLY'] || '').split(',')
+        xen_images_list = {}
+        find_servers.collect { |server| server.host }.each do |host|
+          scope host do
+            xen_images_list[host] = (xen_images || []).collect do |xen_image|
+                do_xen_images.size == 0 || do_xen_images.include?(xen_image[:hostname]) ? xen_image[:hostname] : nil
+              end.compact.join("\n").strip
+          end
         end
+
+        std.su_put "", tmpfile = "/tmp/xen_images.#{Time.now.strftime("%Y%m%d%H%M%S")}.txt", '/tmp/', :mode=>0644, :proc => Proc.new { |from, host|
+          xen_images_list[host].empty? ? xen_images_list[host] : xen_images_list[host] + "\n"
+        }
+
+        run <<-EOF
+          cat #{tmpfile} | while read xen_image ; do {
+            [ -z "${xen_image}" ] || sudo ln -nsf /etc/xen/${xen_image}.cfg /etc/xen/auto/${xen_image}.cfg ;
+          } ; done
+EOF
+        sudo "rm -f #{tmpfile}"
       end
 
       # Same explanation as for create_images, but in this case for unregistering images to be auto-started at host sys boot up
       desc "Make links for xen image configs to be started automatically"
       task :undo_auto_start_images, :roles => :dom0 do
-        handle_xen_images do |xen_image|
-          cmd = "sh -c \"rm -f /etc/xen/auto/#{xen_image[:hostname]}.cfg\""
-          sudo cmd
+        do_xen_images = (ENV['ONLY'] || '').split(',')
+        xen_images_list = {}
+        find_servers.collect { |server| server.host }.each do |host|
+          scope host do
+            xen_images_list[host] = (xen_images || []).collect do |xen_image|
+                do_xen_images.size == 0 || do_xen_images.include?(xen_image[:hostname]) ? xen_image[:hostname] : nil
+              end.compact.join("\n").strip
+          end
         end
+
+        std.su_put "", tmpfile = "/tmp/xen_images.#{Time.now.strftime("%Y%m%d%H%M%S")}.txt", '/tmp/', :mode=>0644, :proc => Proc.new { |from, host|
+          xen_images_list[host].empty? ? xen_images_list[host] : xen_images_list[host] + "\n"
+        }
+
+        run <<-EOF
+          cat #{tmpfile} | while read xen_image ; do {
+            [ -z "${xen_image}" ] || sudo rm -f /etc/xen/auto/${xen_image}.cfg ;
+          } ; done
+EOF
+        sudo "rm -f #{tmpfile}"
       end
 
       # Same explanation as for create_images, but in this case for starting images
       desc "Start Xen images"
       task :start_images, :roles => :dom0 do
-        handle_xen_images do |xen_image|
-          cmd = "sh -c '/usr/sbin/xm create #{xen_image[:hostname]}.cfg 1>/dev/null ; true'"
-          sudo cmd
+        do_xen_images = (ENV['ONLY'] || '').split(',')
+        xen_images_list = {}
+        find_servers.collect { |server| server.host }.each do |host|
+          scope host do
+            xen_images_list[host] = (xen_images || []).collect do |xen_image|
+                do_xen_images.size == 0 || do_xen_images.include?(xen_image[:hostname]) ? xen_image[:hostname] : nil
+              end.compact.join("\n").strip
+          end
         end
+
+        std.su_put "", tmpfile = "/tmp/xen_images.#{Time.now.strftime("%Y%m%d%H%M%S")}.txt", '/tmp/', :mode=>0644, :proc => Proc.new { |from, host|
+          xen_images_list[host].empty? ? xen_images_list[host] : xen_images_list[host] + "\n"
+        }
+
+        run <<-EOF
+          cat #{tmpfile} | while read xen_image ; do {
+            [ -z "${xen_image}" ] || sudo /usr/sbin/xm create ${xen_image}.cfg 1>/dev/null ;
+          } ; done
+EOF
+        sudo "rm -f #{tmpfile}"
       end
 
       # show configs of all registered VMs on host system, use grep to get certain info fields

data/lib/deprec/recipes/xentools.rb

@@ -3,86 +3,107 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :deprec do
     namespace :xentools do
         
-      SRC_PACKAGES[:xentools] = {
-        :url => "http://www.xen-tools.org/software/xen-tools/xen-tools-4.1.tar.gz",
-        :md5sum => "156ec5991f3885ef0daa58c3424d0a35  xen-tools-4.1.tar.gz",
-        :configure => '',
-        :make => ''
-      }
-      
+      set :xentools_default_lvm, 'xendisks' # for ubuntu default, set to nil
+      set :xentools_default_memory, '256Mb' # for ubuntu default, set to '128Mb'
+      set :xentools_default_swap, '512Mb' # for ubuntu default, set to '128Mb'
+      set :xentools_default_dist, 'hardy' # for ubuntu default, set to 'etch'
+      set :xentools_default_gateway, '192.168.1.1' # for ubuntu default, set to nil
+      set :xentools_default_netmask, '255.255.255.0' # for ubuntu default, set to nil
+      set :xentools_default_broadcast, '192.168.1.255' # for ubuntu default, set to nil
+      set :xentools_default_arch, nil # for ubuntu default, set to nil
+      set :xentools_default_mirror, 'http://archive.ubuntu.com/ubuntu/' # for ubuntu default, set to 'http://ftp.us.debian.org/debian/'
+      set :xentools_default_serial_device, nil # for ubuntu default, set to nil
+      set :xentools_default_disk_device, 'xvda' # for ubuntu default, set to 'xvda'
+      set :xentools_default_size, '4Gb' # ubuntu & deprec default
+      set :xentools_default_fs, 'ext3' # ubuntu & deprec default
+      set :xentools_default_image, 'sparse' # ubuntu & deprec default
+      set :xentools_default_noswap, nil # ubuntu & deprec default
+      set :xentools_default_dir, nil # ubuntu & deprec default      
+      set :"xentools_default_install-method", 'debootstrap' # ubuntu & deprec default      
+      set :"xentools_default_install-source", nil # ubuntu & deprec default      
+      set :"xentools_default_copy-cmd", nil # ubuntu & deprec default      
+      set :"xentools_default_debootstrap-cmd", nil # ubuntu & deprec default      
+      set :"xentools_default_tar-cmd", nil # ubuntu & deprec default      
+      set :xentools_default_dhcp, nil # ubuntu & deprec default      
+      set :xentools_default_cache, nil # ubuntu & deprec default      
+      set :xentools_default_passwd, nil # ubuntu & deprec default      
+      set :xentools_default_accounts, nil # ubuntu & deprec default      
+      set :xentools_default_kernel, '/boot/vmlinuz-`uname -r`' # ubuntu & deprec default      
+      set :xentools_default_initrd, '/boot/initrd.img-`uname -r`' # ubuntu & deprec default      
+      set :xentools_default_boot, nil # ubuntu & deprec default      
+      set :xentools_default_bootloader, nil # ubuntu & deprec default, set to '/usr/bin/pygrub' for pygrub loading of VMs
+      set :xentools_default_ext3_options, 'noatime,nodiratime,errors=remount-ro' # ubuntu & deprec default      
+      set :xentools_default_ext2_options, 'noatime,nodiratime,errors=remount-ro' # ubuntu & deprec default      
+      set :xentools_default_xfs_options, 'defaults' # ubuntu & deprec default      
+      set :xentools_default_reiser_options, 'defaults' # ubuntu & deprec default      
+      set :xentools_enable_modules, false # if true, modules will be set to /lib/modules/`uname -r`, for ubuntu default, set to false
+      set :xentools_enable_eth0_tx, true # for ubuntu default, set to false
+
+      set :xentools_custom_commands_pre, nil # should be a string
+      set :xentools_custom_commands_post, nil # should be a string
+      set :xentools_no_utc, false
+      set :xentools_enable_sudo_in_sudoers, false
+      set :xentools_deploy_user, nil
+      set :xentools_deploy_group, nil
+      set :xentools_copy_localtime, false
+      set :xentools_disable_hwclock, false
+      set :xentools_dist_upgrade, false
+
       desc "Install xen-tools"
       task :install, :roles => :dom0 do
         install_deps
-        deprec2.download_src(SRC_PACKAGES[:xentools], src_dir)
-        deprec2.install_from_src(SRC_PACKAGES[:xentools], src_dir)
-        initial_config
+        top.deprec.xentools.fix_config
       end
 
       task :install_deps, :roles => :dom0 do
-        # Cheeky way to ensure we have the dependencies - Mike
         apt.install( {:base => %w(xen-tools libexpect-perl)}, :stable )
       end
       
+      task :fix_config, :roles => :dom0 do
+        sudo "perl -p -i -e 's/^#\\//#!\\//;' /usr/lib/xen-tools/gutsy.d/31-ubuntu-setup"
+        sudo "perl -p -i -e 's/^#\\//#!\\//; s/^prefix=\\$i/prefix=\\$1/' /usr/lib/xen-tools/gutsy.d/100-ubuntu-setup"
+        run "[ -e /etc/xen-tools/xen-tools.conf.bak ] || sudo cp /etc/xen-tools/xen-tools.conf /etc/xen-tools/xen-tools.conf.bak"
+        sudo "perl -p -i -e 's/^\\s*#\\s*[^\\n]*\\n//' /etc/xen-tools/xen-tools.conf"
+        sudo "perl -p -i -e 's/^[^ \\t]*\\n//' /etc/xen-tools/xen-tools.conf"
+      end
+      
       SYSTEM_CONFIG_FILES[:xentools] = [
 
-        {:template => "xen-tools.conf.erb",
-         :path => '/etc/xen-tools/xen-tools.conf',
-         :mode => 0644,
-         :owner => 'root:root'},
- 
         {:template => "xm.tmpl.erb",
          :path => '/etc/xen-tools/xm.tmpl',
          :mode => 0644,
          :owner => 'root:root'},
          
-         # This one is a bugfix for gutsy 
-         {:template => "15-disable-hwclock",
-          :path => '/usr/lib/xen-tools/gutsy.d/15-disable-hwclock',
-          :mode => 0755,
-          :owner => 'root:root'},
+        # added script for user adjustments to debootstrap results
+        {:template => "98-custom.erb",
+         :path => '/usr/lib/xen-tools/hardy.d/98-custom',
+         :mode => 0755,
+         :owner => 'root:root'},
 
-         # This one is a bugfix for gutsy: domU -> domU networking is screwy
-         # http://lists.xensource.com/archives/html/xen-users/2006-05/msg00818.html
-         {:template => "40-setup-networking",
-          :path => '/usr/lib/xen-tools/gutsy.d/40-setup-networking',
-          :mode => 0755,
-          :owner => 'root:root'},
-         
-         # bugfix: #/bin/sh -> #!/bin/sh
-         # bugfix: $i => $1
-         {:template => "100-ubuntu-setup",
-          :path => '/usr/lib/xen-tools/gutsy.d/100-ubuntu-setup',
-          :mode => 0755,
-          :owner => 'root:root'},
+        # added script for having /dev/pts mounted during running of hooks
+        {:template => "99-devpts-umount.erb",
+         :path => '/usr/lib/xen-tools/hardy.d/99-devpts-umount',
+         :mode => 0755,
+         :owner => 'root:root'},
 
-         # bugfix: make sure serial device is created and correct file is edited (/etc/inittab is not used anymore!)
-         {:template => "30-disable-gettys",
-          :path => '/usr/lib/xen-tools/gutsy.d/30-disable-gettys',
-          :mode => 0755,
-          :owner => 'root:root'},
+        # added script for having /dev/pts mounted during running of hooks
+        {:template => "01-mount-devpts.erb",
+         :path => '/usr/lib/xen-tools/hardy.d/01-mount-devpts',
+         :mode => 0755,
+         :owner => 'root:root'},
 
-         # bugfix: removed serial device code, since that's already performed in 30-disable-gettys
-         # bugfix: #/bin/sh -> #!/bin/sh
-         {:template => "31-ubuntu-setup",
-          :path => '/usr/lib/xen-tools/gutsy.d/31-ubuntu-setup',
-          :mode => 0755,
-          :owner => 'root:root'},
+        # added script for auto updating of /boot/grub/menu.lst in xenU VM
+        {:template => "update-grub-xenu.example.erb",
+         :path => '/usr/local/share/xen-tools/update-grub-xenu.example',
+         :mode => 0755,
+         :owner => 'root:root'},
 
-         # added script for user adjustments to debootstrap results
-         # modify this file inside your project (i.e. not in deprec itself) to added your own xen-tools steps
-         {:template => "98-custom",
-          :path => '/usr/lib/xen-tools/gutsy.d/98-custom',
-          :mode => 0755,
-          :owner => 'root:root'}
+        {:template => "kernel-img.conf.example.erb",
+         :path => '/usr/local/share/xen-tools/kernel-img.conf.example',
+         :mode => 0755,
+         :owner => 'root:root'}
       ]
       
-      task :initial_config, :roles => :dom0 do
-        # Non-standard! We're pushing these straight out
-        SYSTEM_CONFIG_FILES[:xentools].each do |file|
-          deprec2.render_template(:xentools, file.merge(:remote => true))
-        end
-      end
-      
       desc "Generate configuration file(s) for xen-tools from template(s)"
       task :config_gen do
         SYSTEM_CONFIG_FILES[:xentools].each do |file|
@@ -93,6 +114,24 @@ Capistrano::Configuration.instance(:must_exist).load do
       desc "Push xen-tools config files to server"
       task :config, :roles => :dom0 do
         deprec2.push_configs(:xentools, SYSTEM_CONFIG_FILES[:xentools])
+        # remove settings from xen-tools.conf in order to re-enable them later on (if set)
+        sudo "cp /etc/xen-tools/xen-tools.conf #{tmpfile = Time.now.strftime("/tmp/xen-tools.conf.%Y%m%d%H%M%S")}"
+        sudo "chmod 666 #{tmpfile}"
+        [ :lvm, :memory, :swap, :dist, :gateway, :netmask, :broadcast, :arch, :mirror, :serial_device, :disk_device, :size, :fs, :image, :noswap, :dir, :"install-method", :"install-source", :"copy-cmd", :"debootstrap-cmd", :"tar-cmd", :dhcp, :cache, :passwd, :accounts, :kernel, :initrd, :boot, :bootloader, :ext3_options, :ext2_options, :xfs_options, :reiser_options, :modules ].each do |v|
+          sudo "perl -p -i -e 's/^\\s*#{v}\\s*=[^\\n]*\\n//' #{tmpfile}"
+        end
+        [ :lvm, :memory, :swap, :dist, :gateway, :netmask, :broadcast, :arch, :mirror, :serial_device, :disk_device, :size, :fs, :image, :noswap, :dir, :"install-method", :"install-source", :"copy-cmd", :"debootstrap-cmd", :"tar-cmd", :dhcp, :cache, :passwd, :accounts, :kernel, :initrd, :boot, :bootloader, :ext3_options, :ext2_options, :xfs_options, :reiser_options ].each do |v|
+          run "echo '#{v} = #{send("xentools_default_#{v}".to_sym)}' >> #{tmpfile}" if send("xentools_default_#{v}".to_sym)
+        end
+        run "echo 'modules = /lib/modules/`uname -r`' >> #{tmpfile}" if xentools_enable_modules
+        sudo "chmod 644 #{tmpfile}"
+        sudo "mv #{tmpfile} /etc/xen-tools/xen-tools.conf"
+        # domU -> domU networking is screwy
+        if xentools_enable_eth0_tx
+          sudo "perl -p -i -e 's/^(\\s*)#(\\s*)(post-up\\s*ethtool\\s*-K\\s*eth0\\s*tx\\s*off)/\$1\$2\$3/' /usr/lib/xen-tools/gutsy.d/40-setup-networking"
+        else
+          sudo "perl -p -i -e 's/^(\\s*)(post-up\\s*ethtool\\s*-K\\s*eth0\\s*tx\\s*off)/#\$1\$2/' /usr/lib/xen-tools/gutsy.d/40-setup-networking"
+        end
       end
       
     end