bfire 0.2.0 → 0.3.0

data/README.md

@@ -1,4 +1,5 @@
 # bfire
+
 A powerful DSL to launch experiments on BonFIRE.
 
 What this does for you:
@@ -12,8 +13,10 @@ What this does for you:
 * Registers metrics into Zabbix;
 * Scale up or scale down groups based on any condition you want, including metric values.
 
-This is very much a work in progress, and a proof of concept. 
-The code is definitely not something you want to look at.
+This is very much a work in progress, and a proof of concept.
+
+A screencast is available at
+<http://bonfire-dev.gforge.inria.fr/public/bfire.mov>.
 
 ## Usage
 
@@ -87,4 +90,5 @@ Content of `my-experiment.rb`:
 See the `examples` directory for up to date examples.
 
 ## Authors
+
 * Cyril Rohr <cyril.rohr@inria.fr>

data/examples/api.snooze

@@ -0,0 +1,3 @@
+uri: http://localhost:4567/
+require: ['ApplicationVndBonfireXml']
+gateway: 131.254.201.242

data/examples/elasticity.rb

@@ -9,15 +9,15 @@ set :gateway, "ssh.bonfire.grid5000.fr"
 set :user, ENV['USER']
 set :logging, INFO
 
-set :squeeze, "BonFIRE Debian Squeeze 2G v2"
-set :zabbix, "BonFIRE Zabbix Aggregator v4"
+set :squeeze, "BonFIRE Debian Squeeze 2G v3"
+set :zabbix, "BonFIRE Zabbix Aggregator v5"
 set :wan, "BonFIRE WAN"
 
 
 # Monitoring
 group :eye, :tag => "BonFIRE-monitor" do
   at "fr-inria"
-  instance_type "small"
+  instance_type "lite"
   deploy conf[:zabbix]
   connect_to conf[:wan]
 end
@@ -25,7 +25,7 @@ end
 # HTTP Routing
 group :web do
   at "fr-inria"
-  instance_type 'small'
+  instance_type 'lite'
   deploy conf[:squeeze]
   # Two interfaces for the publicly facing server
   connect_to conf[:wan]
@@ -48,8 +48,8 @@ end
 # App servers
 group :app do
   at "fr-inria"
-  at "de-hlrs"
-  instance_type "small"
+  # at "de-hlrs"
+  instance_type "lite"
   connect_to conf[:wan]
   deploy conf[:squeeze]
   provider :puppet,
@@ -66,7 +66,7 @@ group :app do
 
   # Scaling
   scale 1..10, {
-    :initial => 2,
+    :initial => 1,
     :up => lambda {|engine|
       values = engine.metric("connection_waiting_time",
         :hosts => engine.group(:web).take(:first),

data/examples/manifests/vm1.pp

@@ -0,0 +1,13 @@
+class vm1 {
+  include iozone;
+  file { "/tmp/iozone.sh"
+    owner => root,
+    mode => 755,
+    content => "while(true); do /usr/local/src/iozone3_397/src/current/iozone -Rab /tmp/output.xls >> /tmp/test.csv; sleep 1; done",
+    require => Exec["install iozone"]
+  }
+  exec{"run iozone":
+    cmd => "/tmp/iozone.sh",
+    require => File["/tmp/iozone.sh"]
+  }
+}

data/examples/manifests/vm2.pp

@@ -0,0 +1,14 @@
+class vm2 {
+  include iozone;
+
+  file { "/tmp/iozone.sh"
+    owner => root,
+    mode => 755,
+    content => "while(true); do /usr/local/src/iozone3_397/src/current/iozone -a; sleep 1; done",
+    require => Exec["install iozone"]
+  }
+  exec{"run iozone":
+    cmd => "/tmp/iozone.sh",
+    require => File["/tmp/iozone.sh"]
+  }
+}

data/examples/mine.rb

@@ -16,16 +16,17 @@ set :wan, "BonFIRE WAN"
 
 group :app do
   attach :db4g
-  
+
   at "fr-inria" do
     type "lite"
     connect "BonFIRE WAN"
     connect :private
   end
-  
+
   at "us-eastc1" do
     type "t1.micro"
   end
+
 end
 
 

data/examples/modules/haproxy/files/haproxy.cfg

@@ -0,0 +1,47 @@
+global
+	log 127.0.0.1	local0
+	log 127.0.0.1	local1 notice
+	#log loghost	local0 info
+	maxconn 4096
+	#chroot /usr/share/haproxy
+	user haproxy
+	group haproxy
+	daemon
+	#debug
+	#quiet
+
+defaults
+	log	global
+	mode	http
+	option	httplog
+	option	dontlognull
+	retries	3
+	option redispatch
+	maxconn	2000
+	contimeout	5000000
+	clitimeout	5000000
+	srvtimeout	5000000
+	
+
+listen	apps 0.0.0.0:80
+
+  stats uri /stats
+	option httpchk GET /
+	option httplog
+	log global
+
+	balance	roundrobin
+
+	srvtimeout	3000000
+
+	option	httpclose		# disable keep-alive
+
+	#errorloc	502	http://192.168.114.58/error502.html
+	#errorfile	503	/etc/haproxy/errors/503.http
+	errorfile	400	/etc/haproxy/errors/400.http
+	errorfile	403	/etc/haproxy/errors/403.http
+	errorfile	408	/etc/haproxy/errors/408.http
+	errorfile	500	/etc/haproxy/errors/500.http
+	errorfile	502	/etc/haproxy/errors/502.http
+	errorfile	503	/etc/haproxy/errors/503.http
+	errorfile	504	/etc/haproxy/errors/504.http

data/examples/modules/iozone/manifests/init.pp

@@ -0,0 +1,14 @@
+class iozone {
+  exec{"download iozone":
+    cmd => "/usr/bin/wget http://iozone.org/src/current/iozone3_397.tar",
+    pwd => "/usr/local/src",
+    creates => "/usr/local/src/iozone3_397.tar"
+  }
+  
+  exec{"install iozone":
+    cmd => "/bin/tar -xf /usr/local/src/iozone3_397.tar && cd /usr/local/src/iozone3_397/src/current && make linux-AMD64",
+    creates => "/usr/local/src/iozone3_397/src/current/iozone",
+    require => Exec["download iozone"]
+  }
+
+}

data/lib/bfire/engine.rb

@@ -342,8 +342,7 @@ module Bfire
           connection.root.experiments.submit(
             :name => conf[:name],
             :description => conf[:description],
-            :walltime => conf[:walltime],
-            :status => "waiting"
+            :walltime => conf[:walltime]
           )
         else
           connection.root.experiments.find{|exp|
@@ -521,17 +520,17 @@ module Bfire
       experiment.reload
       has_changed = (@experiment_state != experiment['status'])
       case experiment['status']
-      when 'waiting'
-        logger.info "#{banner}Experiment is waiting. Nothing to do..."
+      when 'ready'
+        logger.info "#{banner}Experiment is ready. Nothing to do..."
         sleep_time = 10
       when 'running'
         logger.info "#{banner}Experiment is running."
         trigger :running if has_changed
         sleep_time = 30
-      when 'terminating', 'canceling'
+      when 'stopped'
         trigger :stopped if has_changed
         sleep_time = 10
-      when 'terminated', 'canceled'
+      when 'terminated'
         trigger :terminated if has_changed
       end
       @experiment_state = experiment['status']

data/lib/bfire/rule.rb

@@ -69,7 +69,7 @@ module Bfire
         else
           group.trigger :scale_error
         end
-      elsif vms.all?{|compute| compute['state'] == 'ACTIVE'}
+      elsif vms.all?{|compute| compute['state'] == 'RUNNING'}
         group.engine.logger.info "#{group.banner}All compute resources are ACTIVE"
         if group.ssh_accessible?(vms)
           group.engine.logger.info "#{group.banner}All compute resources are SSH-able"

data/lib/bfire/version.rb

@@ -1,3 +1,3 @@
 module Bfire
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bfire
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-21 00:00:00.000000000 +02:00
-default_executable: 
+date: 2012-03-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: restfully
-  requirement: &2161751380 !ruby/object:Gem::Requirement
+  requirement: &2153663260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161751380
+  version_requirements: *2153663260
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
-  requirement: &2161750920 !ruby/object:Gem::Requirement
+  requirement: &2153662620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161750920
+  version_requirements: *2153662620
 - !ruby/object:Gem::Dependency
   name: backports
-  requirement: &2161750500 !ruby/object:Gem::Requirement
+  requirement: &2153662100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161750500
+  version_requirements: *2153662100
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &2161750080 !ruby/object:Gem::Requirement
+  requirement: &2153661520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161750080
+  version_requirements: *2153661520
 - !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &2161749660 !ruby/object:Gem::Requirement
+  requirement: &2153660160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161749660
+  version_requirements: *2153660160
 - !ruby/object:Gem::Dependency
   name: net-ssh-multi
-  requirement: &2161782500 !ruby/object:Gem::Requirement
+  requirement: &2153659720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161782500
+  version_requirements: *2153659720
 - !ruby/object:Gem::Dependency
   name: net-ssh-gateway
-  requirement: &2161782080 !ruby/object:Gem::Requirement
+  requirement: &2153659180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161782080
+  version_requirements: *2153659180
 - !ruby/object:Gem::Dependency
   name: rgl
-  requirement: &2161781660 !ruby/object:Gem::Requirement
+  requirement: &2153658760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161781660
+  version_requirements: *2153658760
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &2161781240 !ruby/object:Gem::Requirement
+  requirement: &2153658320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161781240
+  version_requirements: *2153658320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2161780740 !ruby/object:Gem::Requirement
+  requirement: &2153657700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +120,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *2161780740
+  version_requirements: *2153657700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161780240 !ruby/object:Gem::Requirement
+  requirement: &2153657120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +131,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *2161780240
+  version_requirements: *2153657120
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2161779860 !ruby/object:Gem::Requirement
+  requirement: &2153656680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161779860
+  version_requirements: *2153656680
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &2161779400 !ruby/object:Gem::Requirement
+  requirement: &2153656220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161779400
+  version_requirements: *2153656220
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &2161778980 !ruby/object:Gem::Requirement
+  requirement: &2153655760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161778980
+  version_requirements: *2153655760
 description: Launch experiments on BonFIRE
 email:
 - cyril.rohr@inria.fr
@@ -187,10 +186,13 @@ files:
 - lib/bfire/template.rb
 - lib/bfire/version.rb
 - lib/bfire.rb
+- examples/api.snooze
 - examples/benchmark.rb
 - examples/dag.rb
 - examples/elasticity.rb
 - examples/ibbt.rb
+- examples/manifests/vm1.pp
+- examples/manifests/vm2.pp
 - examples/mine.rb
 - examples/modules/apache2/manifests/init.pp
 - examples/modules/app/files/app/app.rb
@@ -199,8 +201,10 @@ files:
 - examples/modules/app/manifests/init.pp
 - examples/modules/common/manifests/init.pp
 - examples/modules/haproxy/files/default
+- examples/modules/haproxy/files/haproxy.cfg
 - examples/modules/haproxy/files/haproxy.rsyslog.conf
 - examples/modules/haproxy/manifests/init.pp
+- examples/modules/iozone/manifests/init.pp
 - examples/modules/mysql/manifests/init.pp
 - examples/modules/rsyslog/files/rsyslog.conf
 - examples/modules/rsyslog/manifests/init.pp
@@ -212,7 +216,6 @@ files:
 - examples/simple.rb
 - LICENSE
 - README.md
-has_rdoc: true
 homepage: http://github.com/crohr/bfire
 licenses: []
 post_install_message: 
@@ -234,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.3'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: Launch experiments on BonFIRE