albanpeignier-gepetto 0.0.3 → 0.0.4

data/Manifest.txt

@@ -25,6 +25,7 @@ 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

data/README.rdoc

@@ -174,16 +174,17 @@ Destroy sandbox files:
 
 == REQUIREMENTS:
 
+* puppet and puppetmaster: http://reductivelabs.com/trac/puppet/
 * rubigen: http://rubigen.rubyforge.org/
 
 == INSTALL:
 
-* sudo gem install gepetto
+  sudo gem install gepetto
 
-or to use the development release :
+or to use the development release:
 
-* gem sources -a http://gems.github.com
-* sudo gem install albanpeignier-gepetto
+  gem sources -a http://gems.github.com
+  sudo gem install albanpeignier-gepetto
 
 == LICENSE:
 

data/Rakefile

@@ -9,6 +9,8 @@ $hoe = Hoe.new('gepetto', Gepetto::VERSION) do |p|
   p.rubyforge_name       = p.name # TODO this is default value
   p.extra_deps         = [
      ['rubigen',">= #{RubiGen::VERSION}"],
+     ['echoe',">= 3.0.2"],
+     ['cucumber',">= 0.1.8"],
   ]
   p.extra_dev_deps = [
     ['newgem', ">= #{::Newgem::VERSION}"]

data/app_generators/gepetto/gepetto_generator.rb

@@ -16,7 +16,7 @@ class GepettoGenerator < RubiGen::Base
       # Root directory and all subdirectories.
       m.directory ''
 
-      %w{script config manifests files templates tasks}.each { |path| m.directory path }
+      %w{script config manifests files templates log tasks}.each { |path| m.directory path }
 
       m.template_copy_each %w( Rakefile )
 

data/app_generators/gepetto/templates/script/module

@@ -30,6 +30,11 @@ cd $modules_dir
 
 case $command in
     install)
+        if [ ! -x "/usr/bin/git" ]; then
+	   echo "You must install git to retrieve modules managed with it (apt-get install git-core)"
+	   exit 1
+        fi
+
         module_url=$1
         [  -z "$module_url" ] && usage
             

data/gepetto.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gepetto}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alban Peignier"]
-  s.date = %q{2009-01-31}
+  s.date = %q{2009-02-01}
   s.default_executable = %q{gepetto}
   s.description = %q{A helper suite for Puppet projects to create, manage and help daily development  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", "README.rdoc"]
-  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/nodes.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/module.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/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/manifests/nodes.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/module.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.has_rdoc = true
   s.homepage = %q{http://github.com/albanpeignier/gepetto/}
   s.rdoc_options = ["--main", "README.rdoc"]
@@ -27,15 +27,21 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rubigen>, [">= 1.5.2"])
+      s.add_runtime_dependency(%q<echoe>, [">= 3.0.2"])
+      s.add_runtime_dependency(%q<cucumber>, [">= 0.1.8"])
       s.add_development_dependency(%q<newgem>, [">= 1.2.3"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
     else
       s.add_dependency(%q<rubigen>, [">= 1.5.2"])
+      s.add_dependency(%q<echoe>, [">= 3.0.2"])
+      s.add_dependency(%q<cucumber>, [">= 0.1.8"])
       s.add_dependency(%q<newgem>, [">= 1.2.3"])
       s.add_dependency(%q<hoe>, [">= 1.8.0"])
     end
   else
     s.add_dependency(%q<rubigen>, [">= 1.5.2"])
+    s.add_dependency(%q<echoe>, [">= 3.0.2"])
+    s.add_dependency(%q<cucumber>, [">= 0.1.8"])
     s.add_dependency(%q<newgem>, [">= 1.2.3"])
     s.add_dependency(%q<hoe>, [">= 1.8.0"])
   end

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.3'
+  VERSION = '0.0.4'
 end

data/tasks/host.pp

@@ -0,0 +1,79 @@
+Exec { path => "/usr/bin:/usr/sbin/:/bin:/sbin" }
+
+# install qemu
+
+package { qemu: 
+  ensure => installed
+}
+
+# compile kqemu module 
+
+package { [module-assistant, kqemu-common]: 
+  ensure => installed
+}
+
+case $lsbdistdescription {
+  "Ubuntu 8.10": { # fix for ubuntu
+    notice("Use debian kqemu 1.4.0 (kqemu-source 1.3.0 is broken on intreprid):")
+    $debian_kqemu_url="http://ftp.debian.org/debian/pool/main/k/kqemu/kqemu-source_1.4.0~pre1-1_all.deb"
+    exec { "backport-kqemu":
+      command => "wget -O /tmp/kqemu-source.deb $debian_kqemu_url  && dpkg -i /tmp/kqemu-source.deb",
+      unless => "dpkg -l kqemu-source | grep 1.4.0",
+      before => Exec["modass-kqemu"],
+      require => [Package[debhelper], Package[dpatch]]
+    }
+    package { [debhelper, dpatch]: ensure => installed }
+  }
+}
+
+exec { "modass-kqemu":
+  command => "module-assistant a-i kqemu",
+  unless => 'dpkg -l "kqemu-modules-`uname -r`" | grep ^ii',
+  require => [Package[module-assistant], Package[kqemu-common]]
+}
+
+exec { "add kqemu in /etc/modules":
+  command => "echo kqemu >> /etc/modules",
+  unless => "grep kqemu /etc/modules",
+  require => Exec["modass-kqemu"]
+}
+
+file { "/dev/kqemu":
+  # default permissions on debian, but not on ubuntu
+  mode => 666
+}
+
+# install uml-utilities for tunctl 
+
+package { uml-utilities: }
+
+exec { "add tun in /etc/modules":
+  command => "echo tun >> /etc/modules",
+  unless => "grep tun /etc/modules"
+}
+
+exec { "modprobe tun":
+  unless => "lsmod | grep tun"
+}
+
+file { "/dev/net/tun":
+  mode => 666
+}
+
+# provide a basic qemu-ifup
+
+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
+'
+}

data/tasks/sandbox.pp

@@ -58,20 +58,6 @@ iface eth0 inet static
 "
 }
 
-file { "/etc/resolv.conf":
-  content => "nameserver $host_ip
-"
-}
-
-exec { "apt-get update": 
-  alias => "apt-update"
-}
-
-package { [udev, resolvconf]: 
-  ensure => present,
-  require => Exec["apt-update"]
-}
-
 # puppet configuration
 
 file { "/etc/default/puppet":

data/tasks/sandbox.rake

@@ -14,7 +14,9 @@ class Sandbox < Rake::TaskLib
     @@images_directory = directory
   end
 
-  @@puppet_file = File.dirname(__FILE__) + '/sandbox.pp'
+  def puppet_file(name)
+    File.dirname(__FILE__) + "/#{name}.pp"
+  end
 
   attr_reader :name
   attr_accessor :bootstraper, :ip_address, :host_ip_address, :tap_device
@@ -46,22 +48,7 @@ class Sandbox < Rake::TaskLib
 
       desc "Setup local machine to host sandbox"
       task :setup => 'tmp:create' do
-        # experimental qemu required to work with kqemu
-        sudo "apt-get install -t experimental qemu"
-        sudo "module-assistant a-i kqemu"
-        sudo "apt-get install uml-utilities"
-
-        puts <<EOF 
-
-You need to route network traffic between your sandbox and your local network. 
-
-For example in your /etc/qemu-ifup:
-
-/sbin/ifconfig $1 #{host_ip_address}
-iptables -t nat -A POSTROUTING -s #{host_ip_address}/24 -o eth0 -j MASQUERADE
-sysctl -w net.ipv4.ip_forward=1
-
-EOF
+        sudo "puppet #{puppet_file(:host)}"
       end
 
       # Mix between these ways :
@@ -81,7 +68,7 @@ EOF
             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/ { print gensub(\"+\", \"\", \"\", $5) }'"
+            extract_fs_block_size = "/sbin/sfdisk -l #{disk_image} 2> /dev/null | awk '/img1/ { gsub(\"\\+\", \"\", $5); print $5 }'"
             
             sudo "/sbin/mke2fs -jqF /dev/loop0 `#{extract_fs_block_size}`"
           ensure
@@ -107,7 +94,7 @@ EOF
           Tempfile.open('sandbox_puppet_file') do |sandbox_puppet_file|
             sandbox_puppet_file.puts "$host_ip='#{host_ip_address}'"            
             sandbox_puppet_file.puts "$sandbox_ip='#{ip_address}'"            
-            sandbox_puppet_file.puts IO.read(@@puppet_file)
+            sandbox_puppet_file.puts IO.read(puppet_file(:sandbox))
 
             sandbox_puppet_file.close
 
@@ -140,7 +127,7 @@ EOF
       end
 
       desc "Start sandbox"
-      task :start => 'create:tap_device' do
+      task :start => ['create:tap_device', 'tmp:create'] do
         start
       end
 
@@ -172,7 +159,8 @@ EOF
 
       task :clean => 'puppet:clean' do
         # clean known_hosts
-        sh "sed -i '/#{hostname},#{ip_address}/ d' ~/.ssh/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)
       end
 
       task :status do
@@ -216,7 +204,7 @@ EOF
 
     if options[:daemonize]
       options = {
-        :pidfile => "tmp/run/#{name}.pid", :serial => "file:log/#{name}.log"        
+        :pidfile => File.expand_path("tmp/run/#{name}.pid"), :serial => "file:" + File.expand_path("log/#{name}.log")
       }.update(options)
     end
 
@@ -326,7 +314,7 @@ class DebianBoostraper
     options = {
       :arch => 'i386',
       :exclude => debootstrap_excludes,
-      :include => %w{puppet ssh}
+      :include => %w{puppet ssh udev resolvconf}
     }
     
     options_as_string = options.collect{|k,v| "--#{k} #{Array(v).join(',')}"}.join(' ')
@@ -335,7 +323,7 @@ class DebianBoostraper
 
   def debootstrap_excludes
     # excluded by qemu-make-debian-root
-    %w{syslinux at exim mailx libstdc++2.10-glibc2.2 mbr setserial fdutils info ipchains iptables lilo pcmcia-cs ppp pppoe pppoeconf pppconfig wget telnet cron logrotate exim4 exim4-base exim4-config exim4-daemon-light pciutils modconf tasksel}
+    %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}
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: albanpeignier-gepetto
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Alban Peignier
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-31 00:00:00 -08:00
+date: 2009-02-01 00:00:00 -08:00
 default_executable: gepetto
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +21,24 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.5.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: echoe
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 3.0.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.8
+    version: 
 - !ruby/object:Gem::Dependency 
   name: newgem
   version_requirement: 
@@ -78,6 +96,7 @@ files:
 - puppet_generators/module/templates/manifests/init.pp
 - script/destroy
 - script/generate
+- tasks/host.pp
 - tasks/log.rake
 - tasks/puppet.rake
 - tasks/sandbox.pp