Permalink
Browse files

Support Kytoon and add new XenServer runner.

Add support for latest openstack_vpc changes (Kytoon) and
a new Puppet XenServer runner.
  • Loading branch information...
1 parent 3810b31 commit 8908f2dd1caab71fd5b2f702e877076c5218fdcb @dprince committed Jul 24, 2012
View
2 .rvmrc
@@ -1 +1 @@
-rvm 1.8.7@smokestack
+rvm 1.9.3@smokestack
View
@@ -8,8 +8,7 @@ gem 'rails', '3.1.1'
gem 'popen4'
gem 'mysql'
gem 'resque', '1.19.0'
-gem 'SystemTimer', '~> 1.2.3'
-gem 'chef-vpc-toolkit'
+gem 'kytoon'
# Gems used only for assets and not required
# in production environments by default.
View
@@ -2,7 +2,6 @@ GEM
remote: http://rubygems.org/
specs:
Platform (0.4.0)
- SystemTimer (1.2.3)
actionmailer (3.1.1)
actionpack (= 3.1.1)
mail (~> 2.3.0)
@@ -33,11 +32,6 @@ GEM
multi_json (~> 1.0)
arel (2.2.1)
builder (3.0.0)
- chef-vpc-toolkit (2.8.1)
- builder
- json
- rake
- uuidtools
coffee-rails (3.1.1)
coffee-script (>= 2.2.0)
railties (~> 3.1.0)
@@ -51,6 +45,11 @@ GEM
hike (1.2.1)
i18n (0.6.0)
json (1.6.1)
+ kytoon (1.0.1)
+ builder
+ json
+ rake
+ uuidtools
libv8 (3.3.10.4)
mail (2.3.0)
i18n (>= 0.4.0)
@@ -134,9 +133,8 @@ PLATFORMS
ruby
DEPENDENCIES
- SystemTimer (~> 1.2.3)
- chef-vpc-toolkit
coffee-rails (~> 3.1.1)
+ kytoon
mysql
popen4
rails (= 3.1.1)
View
@@ -9,7 +9,7 @@ A web application with a REST based HTTP interface to help smoke test OpenStack.
* Rails 3.1
* Resque: a redis backed job queue
* Job runner templates: The default VPC job runner uses openstack_vpc to spin up groups of servers in the cloud for smoke testing. A job runner for unit tests is included as well. (add more job runners for: PXE, Crowbar, etc.)
-* Configuration management to install and configure everything (Chef/Puppet)
+* Configuration management to install and configure everything (Puppet)
* Packages to install software (currently supports Fedora/Ubuntu)
For more information and examples see the wiki: http://wiki.openstack.org/smokestack
@@ -60,7 +60,7 @@ At this point the web application should be running at http://localhost:3000.
# setup vpc
ssh-keygen # don't use passphrase
- # FIXME - add details on creating .chef_vpc_toolkit.conf for running VPC jobs
+ # FIXME - add details on creating .kytoon.conf for running VPC jobs
# in tab 1: launch some workers
bundle exec rake resque:workers QUEUE="vpc" COUNT=3
View
@@ -5,10 +5,9 @@
class Job < ActiveRecord::Base
- CHEF_VPC = "Chef Vpc"
- CHEF_VPC_XEN = "Chef Vpc Xen"
PUPPET_VPC = "Puppet Vpc"
- JOB_TYPES = [CHEF_VPC, CHEF_VPC_XEN, PUPPET_VPC]
+ PUPPET_XEN = "Puppet Xen"
+ JOB_TYPES = [PUPPET_VPC, PUPPET_XEN]
validates_presence_of :job_group_id
belongs_to :job_group
@@ -27,7 +26,7 @@ def handle_after_save
self.job_group.update_status
end
- def self.run_job(job, template_name="chef_vpc_runner.sh.erb", script_text=nil)
+ def self.run_job(job, template_name="puppet_vpc_runner.sh.erb", script_text=nil)
job.update_attributes(:status => "Running", :start_time => Time.now)
View
@@ -1,22 +0,0 @@
-class JobChefVpc < Job
-
- @queue=:vpc
-
- def self.perform(id)
- 5.times do
- begin
- job=JobChefVpc.find(id)
- JobChefVpc.run_job(job)
- break
- rescue ActiveRecord::RecordNotFound
- sleep 5
- end
- end
- end
-
- after_create :handle_after_create
- def handle_after_create
- AsyncExec.run_job(JobChefVpc, self.id)
- end
-
-end
@@ -1,22 +0,0 @@
-class JobChefVpcXen < Job
-
- @queue=:xen
-
- def self.perform(id)
- 5.times do
- begin
- job=JobChefVpcXen.find(id)
- self.run_job(job)
- break
- rescue ActiveRecord::RecordNotFound
- sleep 5
- end
- end
- end
-
- after_create :handle_after_create
- def handle_after_create
- AsyncExec.run_job(JobChefVpcXen, self.id)
- end
-
-end
Oops, something went wrong.

0 comments on commit 8908f2d

Please sign in to comment.