Fixing rake errors

8 files changed, 7 insertions, 33 deletions

diff --git a/cloudmasterd/Manifest.txt b/cloudmasterd/Manifest.txt
index 44bf240..230494d 100644
--- a/cloudmasterd/Manifest.txt
+++ b/cloudmasterd/Manifest.txt
@@ -17,9 +17,6 @@ script/destroy
 script/generate
 script/txt2html
 setup.rb
-spec/cloudmasterd.rb
-spec/spec.opts
-spec/spec_helper.rb
 tasks/deployment.rake
 tasks/environment.rake
 tasks/rspec.rake
diff --git a/cloudmasterd/config.example.yml b/cloudmasterd/config.example.yml
index fdfc900..3343821 100644
--- a/cloudmasterd/config.example.yml
+++ b/cloudmasterd/config.example.yml
@@ -4,7 +4,7 @@
 
 ##### HTTP SERVER #####################################################################
 
-# Under what HTTP environment are you running the Everestd server? The following methods
+# Under what HTTP environment are you running the Cloudmasterd server? The following methods
 # are currently supported:
 #
 # webrick -- simple stand-alone HTTP server; this is the default method
diff --git a/cloudmasterd/config/hoe.rb b/cloudmasterd/config/hoe.rb
index f76e707..614f0d2 100644
--- a/cloudmasterd/config/hoe.rb
+++ b/cloudmasterd/config/hoe.rb
@@ -1,8 +1,8 @@
 require 'cloudmasterd/version'
 
-AUTHOR = 'Brenton Leanhardt'  # can also be an array of Authors
-EMAIL = "bleanhar@redhat.com"
-DESCRIPTION = "daemon for machine configuration"
+AUTHOR = 'Greg Blomquist'  # can also be an array of Authors
+EMAIL = "gblomqui@redhat.com"
+DESCRIPTION = "daemon for a cloudmaster"
 GEM_NAME = 'cloudmasterd' # what ppl will type to install your gem
 RUBYFORGE_PROJECT = 'cloudmasterd' # The unix name for your project
 HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
@@ -31,7 +31,7 @@ end
 REV = nil 
 # UNCOMMENT IF REQUIRED: 
 # REV = YAML.load(`svn info`)['Revision']
-VERS = Everestd::VERSION::STRING + (REV ? ".#{REV}" : "")
+VERS = Cloudmasterd::VERSION::STRING + (REV ? ".#{REV}" : "")
 RDOC_OPTS = ['--quiet', '--title', 'cloudmasterd documentation',
     "--opname", "index.html",
     "--line-numbers", 
diff --git a/cloudmasterd/lib/cloudmasterd.rb b/cloudmasterd/lib/cloudmasterd.rb
index a8d540b..1836630 100644
--- a/cloudmasterd/lib/cloudmasterd.rb
+++ b/cloudmasterd/lib/cloudmasterd.rb
@@ -14,7 +14,6 @@ require 'xmlrpc/client'
 Camping.goes :Cloudmasterd
 Cloudmasterd.picnic!
 
-
 module Cloudmasterd::Helpers
   class Cobblerd
     def initialize(repo)
@@ -90,7 +89,7 @@ module Cloudmasterd::Controllers
     # Find the best host on which to create a VM that requires
     # the given "disk_size" and "ram"
     def _get_best_host(disk_size, ram)
-      return `func-find-resources -m #{ram} -d #{disk_size}`.split(':')[0]
+      return `func-find-resources -m #{ram} -d #{disk_size} -f HostVolGroupImages`.split(':')[0]
     end
 
     # run the appropriate koan command to create the given "fqdn"
diff --git a/cloudmasterd/script/txt2html b/cloudmasterd/script/txt2html
index 1682173..b936c8b 100755
--- a/cloudmasterd/script/txt2html
+++ b/cloudmasterd/script/txt2html
@@ -13,7 +13,7 @@ require 'syntax/convertors/html'
 require 'erb'
 require File.dirname(__FILE__) + '/../lib/cloudmasterd/version.rb'
 
-version  = Everestd::VERSION::STRING
+version  = Cloudmasterd::VERSION::STRING
 download = 'http://rubyforge.org/projects/cloudmasterd'
 
 class Fixnum
diff --git a/cloudmasterd/spec/cloudmasterd_spec.rb b/cloudmasterd/spec/cloudmasterd_spec.rb
deleted file mode 100644
index a52055a..0000000
--- a/cloudmasterd/spec/cloudmasterd_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
-
-# Time to add your specs!
-# http://rspec.info/
-describe "Place your specs here" do
-  
-  it "find this spec in spec directory" do
-    violated "Be sure to write your specs"
-  end
-  
-end
diff --git a/cloudmasterd/spec/spec.opts b/cloudmasterd/spec/spec.opts
deleted file mode 100644
index 53607ea..0000000
--- a/cloudmasterd/spec/spec.opts
+++ /dev/null
@@ -1 +0,0 @@
---colour
diff --git a/cloudmasterd/spec/spec_helper.rb b/cloudmasterd/spec/spec_helper.rb
deleted file mode 100644
index ecb7350..0000000
--- a/cloudmasterd/spec/spec_helper.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  gem 'rspec'
-  require 'spec'
-end
-
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'cloudmasterd'