gepetto 0.0.10 → 0.0.11

data/Manifest.txt

@@ -7,13 +7,14 @@ app_generators/gepetto/gepetto_generator.rb
 app_generators/gepetto/templates/Rakefile
 app_generators/gepetto/templates/config/fileserver.conf
 app_generators/gepetto/templates/config/puppet.conf
+app_generators/gepetto/templates/config/qemu-ifup
 app_generators/gepetto/templates/manifests/classes/empty.pp
 app_generators/gepetto/templates/manifests/defaults.pp
 app_generators/gepetto/templates/manifests/nodes.pp
+app_generators/gepetto/templates/manifests/sandbox-sample.pp
+app_generators/gepetto/templates/manifests/sandbox.pp
 app_generators/gepetto/templates/manifests/site.pp
 app_generators/gepetto/templates/manifests/templates.pp
-app_generators/gepetto/templates/manifests/sandbox.pp
-app_generators/gepetto/templates/manifests/sandbox-sample.pp
 app_generators/gepetto/templates/script/module
 app_generators/gepetto/templates/script/puppetca
 app_generators/gepetto/templates/script/puppetmasterd

data/app_generators/gepetto/gepetto_generator.rb

@@ -29,6 +29,7 @@ class GepettoGenerator < RubiGen::Base
       m.template_copy_each %w( empty.pp ), 'manifests/classes'
 
       m.template_copy_each %w( puppet.conf fileserver.conf ), 'config'
+      m.template_copy_each %w( qemu-ifup ), 'config', script_options
 
       m.template_copy_each %w( puppetmasterd puppetca puppetrun module ), 'script', script_options
 

data/app_generators/gepetto/templates/config/qemu-ifup

@@ -0,0 +1,11 @@
+#!/bin/sh -x
+
+if [ "$USER" != "root" -o "$1" != "sudo" ]; then
+  exec sudo -p "Password for $0:" $0 sudo $1
+fi
+
+[ "$1" = "sudo" ] && shift
+
+/sbin/ifconfig $1 172.20.0.1
+iptables -t nat -A POSTROUTING -s 172.20.0.1/24 -o eth0 -j MASQUERADE
+sysctl -w net.ipv4.ip_forward=1

data/gepetto.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gepetto}
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alban Peignier"]
-  s.date = %q{2010-02-01}
+  s.date = %q{2010-02-05}
   s.default_executable = %q{gepetto}
   s.description = %q{A helper suite for Puppet projects to create, manage and help daily development
 
@@ -14,7 +14,7 @@ More information about Puppet: http://reductivelabs.com/trac/puppet/}
   s.email = ["alban.peignier@free.fr"]
   s.executables = ["gepetto"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt"]
-  s.files = ["History.txt", "Manifest.txt", "README.rdoc", "Rakefile", "app_generators/gepetto/USAGE", "app_generators/gepetto/gepetto_generator.rb", "app_generators/gepetto/templates/Rakefile", "app_generators/gepetto/templates/config/fileserver.conf", "app_generators/gepetto/templates/config/puppet.conf", "app_generators/gepetto/templates/manifests/classes/empty.pp", "app_generators/gepetto/templates/manifests/defaults.pp", "app_generators/gepetto/templates/manifests/nodes.pp", "app_generators/gepetto/templates/manifests/site.pp", "app_generators/gepetto/templates/manifests/templates.pp", "app_generators/gepetto/templates/manifests/sandbox.pp", "app_generators/gepetto/templates/manifests/sandbox-sample.pp", "app_generators/gepetto/templates/script/module", "app_generators/gepetto/templates/script/puppetca", "app_generators/gepetto/templates/script/puppetmasterd", "app_generators/gepetto/templates/script/puppetrun", "bin/gepetto", "gepetto.gemspec", "lib/gepetto.rb", "lib/gepetto/tasks.rb", "puppet_generators/module/USAGE", "puppet_generators/module/module_generator.rb", "puppet_generators/module/templates/README", "puppet_generators/module/templates/manifests/init.pp", "script/destroy", "script/generate", "tasks/host.pp", "tasks/log.rake", "tasks/puppet.rake", "tasks/sandbox.pp", "tasks/sandbox.rake", "tasks/tmp.rake", "tasks/utils.rake"]
+  s.files = ["History.txt", "Manifest.txt", "README.rdoc", "Rakefile", "app_generators/gepetto/USAGE", "app_generators/gepetto/gepetto_generator.rb", "app_generators/gepetto/templates/Rakefile", "app_generators/gepetto/templates/config/fileserver.conf", "app_generators/gepetto/templates/config/puppet.conf", "app_generators/gepetto/templates/config/qemu-ifup", "app_generators/gepetto/templates/manifests/classes/empty.pp", "app_generators/gepetto/templates/manifests/defaults.pp", "app_generators/gepetto/templates/manifests/nodes.pp", "app_generators/gepetto/templates/manifests/sandbox-sample.pp", "app_generators/gepetto/templates/manifests/sandbox.pp", "app_generators/gepetto/templates/manifests/site.pp", "app_generators/gepetto/templates/manifests/templates.pp", "app_generators/gepetto/templates/script/module", "app_generators/gepetto/templates/script/puppetca", "app_generators/gepetto/templates/script/puppetmasterd", "app_generators/gepetto/templates/script/puppetrun", "bin/gepetto", "gepetto.gemspec", "lib/gepetto.rb", "lib/gepetto/tasks.rb", "puppet_generators/module/USAGE", "puppet_generators/module/module_generator.rb", "puppet_generators/module/templates/README", "puppet_generators/module/templates/manifests/init.pp", "script/destroy", "script/generate", "tasks/host.pp", "tasks/log.rake", "tasks/puppet.rake", "tasks/sandbox.pp", "tasks/sandbox.rake", "tasks/tmp.rake", "tasks/utils.rake"]
   s.homepage = %q{http://github.com/albanpeignier/gepetto/}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/lib/gepetto.rb

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Gepetto
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

data/tasks/host.pp

@@ -58,23 +58,10 @@ file { "/dev/net/tun":
   mode => 666
 }
 
-# provide a basic qemu-ifup
+package { debootstrap: }
 
-file { "/etc/qemu-ifup":
-  mode => 755,
-  content => '#!/bin/sh -x
-
-if [ "$USER" != "root" -o "$1" != "sudo" ]; then
-  exec sudo -p "Password for $0:" $0 sudo $1
-fi
-
-[ "$1" = "sudo" ] && shift
-
-/sbin/ifconfig $1 172.20.0.1
-iptables -t nat -A POSTROUTING -s 172.20.0.1/24 -o eth0 -j MASQUERADE
-sysctl -w net.ipv4.ip_forward=1
-',
-  require => Package[qemu]
+if $operatingsystem == Debian {
+  package { [syslinux-common, extlinux]: }
+} else {
+  package { syslinux: }
 }
-
-package { [debootstrap, grub]: }

data/tasks/sandbox.pp

@@ -24,10 +24,14 @@ exec { "inittab-no-tty-gettys":
   onlyif => "grep 'getty 38400 tty[23456]' /etc/inittab"
 }
 
-file { "/etc/hostname":
+file { ["/etc/hostname", "/etc/mailname"]:
   content => "sandbox"
 }
 
+file {  "/etc/default/locale":
+  content => "LANG=en_US.UTF-8"
+}
+
 # an host object doesn't find a provider
 file { "/etc/hosts":
   content => "127.0.0.1 localhost
@@ -88,6 +92,7 @@ pluginsync=false
 color=false
 
 [puppetd]
+certname=sandbox
 report=true
 # run puppetd .. every day
 runinterval = 86400

data/tasks/sandbox.rake

@@ -95,7 +95,7 @@ class Sandbox < Rake::TaskLib
         task :image do
           sh "qemu-img create -f raw #{disk_image} #{disk_size}"
           # create the partition table
-          sh "echo '63,' | /sbin/sfdisk --no-reread -uS -H16 -S63 #{disk_image}"
+          sh "echo '63,,L,*' | /sbin/sfdisk --no-reread -uS -H16 -S63 #{disk_image}"
         end
 
         task :fs do 
@@ -104,9 +104,10 @@ class Sandbox < Rake::TaskLib
             sudo "losetup -o #{fs_offset} /dev/loop0 #{disk_image}"
             
             # because '/sbin/sfdisk -s /dev/loop0' returns a wrong value :
-            extract_fs_block_size = "/sbin/sfdisk -l #{disk_image} 2> /dev/null | awk '/img1/ { gsub(\"\\+\", \"\", $5); print $5 }'"
+            linux_partition_info = `/sbin/sfdisk -l #{disk_image}`.scan(%r{#{disk_image}.*Linux}).first
+            extract_fs_block_size = linux_partition_info.split[5].to_i
             
-            sudo "/sbin/mke2fs -jqF /dev/loop0 `#{extract_fs_block_size}`"
+            sudo "/sbin/mke2fs -jqF /dev/loop0 #{extract_fs_block_size}"
           ensure
             sudo "losetup -d /dev/loop0"
           end
@@ -137,35 +138,39 @@ class Sandbox < Rake::TaskLib
           end
         end
 
-        task :grub do
+        task :syslinux do
+          extlinux_dir = "#{mount_point}/boot/extlinux"
+
           mount do
-            chroot_sh "DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes grub"
+            sudo "mkdir -p #{extlinux_dir}" unless File.exists?(extlinux_dir)
+            Tempfile.open('extlinux_conf') do |f|
+              f.puts "DEFAULT linux"
+              f.puts "LABEL linux"
+              f.puts "SAY Now booting sandbox from syslinux ..."
+              f.puts "KERNEL /vmlinuz"
+              f.puts "APPEND ro root=/dev/hda1 initrd=/initrd.img"
+              f.close
+              sudo "cp #{f.path} #{extlinux_dir}/extlinux.conf"
+            end
 
-            grub_dir = "#{mount_point}/boot/grub"
-            chroot_sh "mkdir /boot/grub" unless File.exists?(grub_dir)
+            sudo "extlinux --install -H16 -S63 #{mount_point}/boot/extlinux"
+          end
+          sudo "dd if=/usr/lib/syslinux/mbr.bin of=#{disk_image} conv=notrunc"
+        end
 
-            stage_files = Dir["#{mount_point}/usr/lib/grub/**/stage?", "#{mount_point}/usr/lib/grub/**/e2fs_stage1_5"]
-            sudo "cp #{stage_files.join(' ')} #{grub_dir}"
+        task :ssh do
+          ssh_pubkey = Dir["#{ENV['HOME']}/.ssh/id_*pub"].first
+          ssh_dir = "#{mount_point}/root/.ssh"
 
-            Tempfile.open('menu_lst') do |f|
-              f.write(['default 0',
-                       'timeout 0',
-                       'title Linux',
-                       'root (hd0,0)',
-                       'kernel /vmlinuz root=/dev/hda1 ro',
-                       'initrd /initrd.img'].join("\n"))
-              f.close
-              sudo "cp #{f.path} #{grub_dir}/menu.lst"
-            end
+          mount do
+            sudo "mkdir #{ssh_dir}"
+            sudo "cp #{ssh_pubkey} #{ssh_dir}/authorized_keys"
           end
+        end
 
-          Tempfile.open('grub_input') do |f| 
-            f.write(["device (hd0) #{disk_image}",
-                     "root (hd0,0)",
-                     "setup (hd0)",
-                     "quit"].join("\n"))
-            f.close
-            sudo "grub --device-map=/dev/null < #{f.path}"
+        task :update do
+          mount do
+            chroot_sh "apt-get update"
           end
         end
 
@@ -197,7 +202,7 @@ class Sandbox < Rake::TaskLib
       end
 
       desc "Create a fresh image for sandbox"
-      task :create => [ 'clean', 'create:image', 'create:fs', 'create:system', 'create:kernel', 'create:grub', 'create:config', 'create:snapshot' ]
+      task :create => [ 'clean', 'create:image', 'create:fs', 'create:system', 'create:update', 'create:kernel', 'create:syslinux', 'create:config', 'create:ssh', 'create:snapshot' ]
 
       desc "Destroy sandbox images"
       task :destroy => 'clean' do
@@ -239,7 +244,7 @@ class Sandbox < Rake::TaskLib
       task :clean => 'puppet:clean' do
         # clean known_hosts
         known_hosts_file="#{ENV['HOME']}/.ssh/known_hosts"
-        sh "sed -i '/#{hostname},#{ip_address}/ d' #{known_hosts_file}" if File.exists?(known_hosts_file)
+        sh "sed -i -e '/#{hostname} / d'  -e '/#{ip_address} / d' #{known_hosts_file}" if File.exists?(known_hosts_file)
       end
 
       task :status do
@@ -274,8 +279,9 @@ class Sandbox < Rake::TaskLib
       :snapshot => ENV['SNAPSHOT'],
       :hda => disk_image,
       :nographic => false,
+      :"enable-kvm" => true,
       :m => memory_size,
-      :net => ["nic", "tap,ifname=#{tap_device}"]
+      :net => ["nic", "tap,ifname=#{tap_device},script=config/qemu-ifup"]
     }.update(options)
 
     if options[:daemonize]
@@ -394,8 +400,9 @@ class DebianBoostraper
   def initialize(&block)
     default_attributes
 
-    @include = %w{puppet ssh udev resolvconf}
-    @exclude = %w{syslinux at exim mailx libstdc++2.10-glibc2.2 mbr setserial fdutils info ipchains iptables lilo pcmcia-cs ppp pppoe pppoeconf pppconfig telnet exim4 exim4-base exim4-config exim4-daemon-light pciutils modconf tasksel console-common console-tools console-data base-config man-db manpages}
+    # extlinux is provided by syslinux in lenny
+    @include = %w{puppet ssh udev resolvconf syslinux debian-archive-keyring}
+    @exclude = %w{at exim mailx libstdc++2.10-glibc2.2 mbr setserial fdutils info ipchains iptables lilo pcmcia-cs ppp pppoe pppoeconf pppconfig telnet exim4 exim4-base exim4-config exim4-daemon-light pciutils modconf tasksel console-common console-tools console-data base-config man-db manpages}
 
     yield self if block_given?
   end
@@ -404,6 +411,7 @@ class DebianBoostraper
     @version = 'lenny'
     @mirror = 'http://ftp.debian.org/debian'
     @architecture = Sandbox.default_architecture
+    @components = %w{main contrib non-free}
   end
 
   def bootstrap(root)
@@ -415,7 +423,8 @@ class DebianBoostraper
     {
       :arch => architecture,  
       :exclude => @exclude,
-      :include => @include
+      :include => @include,
+      :components => @components
     }
   end
 

data/tasks/tmp.rake

@@ -16,7 +16,11 @@ namespace :tmp do
     namespace name do
       desc "Clears all files in #{tmp_directory}"
       task :clear do
-        FileUtils.rm(Dir["#{tmp_directory}/[^.]*"])
+        files = Dir["#{tmp_directory}/**/*"].reject { |f| File.directory?(f) }
+        unless files.empty?
+          puts "* remove #{files.size} files in #{tmp_directory}"
+          FileUtils.rm files
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gepetto
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
 - Alban Peignier
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-01 00:00:00 +01:00
+date: 2010-02-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,13 +85,14 @@ files:
 - app_generators/gepetto/templates/Rakefile
 - app_generators/gepetto/templates/config/fileserver.conf
 - app_generators/gepetto/templates/config/puppet.conf
+- app_generators/gepetto/templates/config/qemu-ifup
 - app_generators/gepetto/templates/manifests/classes/empty.pp
 - app_generators/gepetto/templates/manifests/defaults.pp
 - app_generators/gepetto/templates/manifests/nodes.pp
+- app_generators/gepetto/templates/manifests/sandbox-sample.pp
+- app_generators/gepetto/templates/manifests/sandbox.pp
 - app_generators/gepetto/templates/manifests/site.pp
 - app_generators/gepetto/templates/manifests/templates.pp
-- app_generators/gepetto/templates/manifests/sandbox.pp
-- app_generators/gepetto/templates/manifests/sandbox-sample.pp
 - app_generators/gepetto/templates/script/module
 - app_generators/gepetto/templates/script/puppetca
 - app_generators/gepetto/templates/script/puppetmasterd