albanpeignier-gepetto 0.0.4 → 0.0.5

data/Manifest.txt

@@ -7,6 +7,7 @@ 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/defaults.pp
 app_generators/gepetto/templates/manifests/nodes.pp
 app_generators/gepetto/templates/manifests/site.pp
 app_generators/gepetto/templates/manifests/templates.pp

data/Rakefile

@@ -11,10 +11,12 @@ $hoe = Hoe.new('gepetto', Gepetto::VERSION) do |p|
      ['rubigen',">= #{RubiGen::VERSION}"],
      ['echoe',">= 3.0.2"],
      ['cucumber',">= 0.1.8"],
+     ['hoe',">= 1.8.0"],
+     ['newgem', ">= #{::Newgem::VERSION}"]
   ]
-  p.extra_dev_deps = [
-    ['newgem', ">= #{::Newgem::VERSION}"]
-  ]
+  # p.extra_dev_deps = [
+  #   ['newgem', ">= #{::Newgem::VERSION}"]
+  # ]
 
   p.clean_globs |= %w[**/.DS_Store tmp *.log]
   path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"

data/app_generators/gepetto/gepetto_generator.rb

@@ -16,11 +16,13 @@ class GepettoGenerator < RubiGen::Base
       # Root directory and all subdirectories.
       m.directory ''
 
-      %w{script config manifests files templates log tasks}.each { |path| m.directory path }
+      %w{script config manifests manifests/classes files templates log tasks}.each { |path| m.directory path }
 
       m.template_copy_each %w( Rakefile )
 
-      m.template_copy_each %w( site.pp templates.pp nodes.pp ), 'manifests'
+      m.template_copy_each %w( defaults.pp site.pp templates.pp nodes.pp ), 'manifests'
+
+      m.template_copy_each %w( empty.pp ), 'manifests/classes'
 
       m.template_copy_each %w( puppet.conf fileserver.conf ), 'config'
 

data/app_generators/gepetto/templates/manifests/nodes.pp

@@ -0,0 +1,5 @@
+# Node Definitions
+
+# node 'sandbox' {
+#   notice("sandbox is ready")    
+# }

data/app_generators/gepetto/templates/manifests/site.pp

@@ -0,0 +1,9 @@
+# Site Manifest
+
+# For more details, see Puppet Best Practices 2.0 :
+# http://reductivelabs.com/trac/puppet/wiki/PuppetBestPractice
+
+import "defaults"
+import "classes/*"
+import "templates"
+import "nodes"

data/gepetto.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gepetto}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alban Peignier"]
-  s.date = %q{2009-02-01}
+  s.date = %q{2009-02-03}
   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"]
@@ -29,12 +29,14 @@ Gem::Specification.new do |s|
       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_runtime_dependency(%q<hoe>, [">= 1.8.0"])
+      s.add_runtime_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<hoe>, [">= 1.8.0"])
       s.add_dependency(%q<newgem>, [">= 1.2.3"])
       s.add_dependency(%q<hoe>, [">= 1.8.0"])
     end
@@ -42,6 +44,7 @@ Gem::Specification.new do |s|
     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<hoe>, [">= 1.8.0"])
     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.4'
+  VERSION = '0.0.5'
 end

data/tasks/host.pp

@@ -3,33 +3,40 @@ Exec { path => "/usr/bin:/usr/sbin/:/bin:/sbin" }
 # install qemu
 
 package { qemu: 
-  ensure => installed
+  ensure => "0.9.1+svn20090104-1"
 }
 
-# compile kqemu module 
+case $operatingsystem {
+  debian: {
+    notice("qemu from experimental is required for the moment")
 
-package { [module-assistant, kqemu-common]: 
-  ensure => installed
-}
+    file { "/etc/apt/sources.list.d/debian-experimental.list":
+      content => "deb http://ftp.debian.org/debian/ experimental main"
+    }
 
-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]]
+    exec { "apt-get update":
+      require => File["/etc/apt/sources.list.d/debian-experimental.list"]
+    }
+
+    exec { "apt-get install -t experimental -y --force-yes qemu":
+      require => Exec["apt-get update"],
+      before => Package[qemu]
     }
-    package { [debhelper, dpatch]: ensure => installed }
   }
 }
 
+# compile kqemu module 
+
+package { kqemu-source:
+  ensure => "1.4.0~pre1-1",
+  require => Package[qemu]
+}
+
 exec { "modass-kqemu":
-  command => "module-assistant a-i kqemu",
+  # modass returns 249 with non-inter ...
+  command => 'module-assistant --non-inter a-i kqemu || dpkg -l "kqemu-modules-`uname -r`" | grep ^ii',
   unless => 'dpkg -l "kqemu-modules-`uname -r`" | grep ^ii',
-  require => [Package[module-assistant], Package[kqemu-common]]
+  require => Package[kqemu-source]
 }
 
 exec { "add kqemu in /etc/modules":
@@ -38,9 +45,16 @@ exec { "add kqemu in /etc/modules":
   require => Exec["modass-kqemu"]
 }
 
+exec { "modprobe-kqemu":
+  command => "modprobe kqemu",
+  unless => "lsmod | grep kqemu",
+  require => Exec["modass-kqemu"]
+}
+
 file { "/dev/kqemu":
   # default permissions on debian, but not on ubuntu
-  mode => 666
+  mode => 666,
+  require => Exec["modprobe-kqemu"]
 }
 
 # install uml-utilities for tunctl 
@@ -75,5 +89,6 @@ fi
 /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]
 }

data/tasks/puppet.rake

@@ -1,6 +1,8 @@
 namespace :puppet do
   desc "Check syntax of puppet manifests"
   task :check_syntax do
-    sh "puppet --color=false --confdir=/tmp --vardir=/tmp --parseonly --ignoreimport #{FileList['manifests/**/*.pp'].join(' ')}"
+    FileList['manifests/**/*.pp'].each do |manifest|
+      sh "puppet --color=false --confdir=/tmp --vardir=/tmp --parseonly --ignoreimport #{manifest}"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: albanpeignier-gepetto
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Alban Peignier
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-01 00:00:00 -08:00
+date: 2009-02-03 00:00:00 -08:00
 default_executable: gepetto
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,6 +39,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.1.8
     version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.8.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: newgem
   version_requirement: