Moved the cloud daemon to cloudmasterd to give it a better name

33 files changed, 62 insertions, 58 deletions

diff --git a/cloud/.gitignore b/cloudmasterd/.gitignore
index 3567727..3567727 100644
--- a/cloud/.gitignore
+++ b/cloudmasterd/.gitignore
diff --git a/cloud/History.txt b/cloudmasterd/History.txt
index 59ce905..59ce905 100644
--- a/cloud/History.txt
+++ b/cloudmasterd/History.txt
diff --git a/cloud/License.txt b/cloudmasterd/License.txt
index 7a2ed3c..7a2ed3c 100644
--- a/cloud/License.txt
+++ b/cloudmasterd/License.txt
diff --git a/cloud/Manifest.txt b/cloudmasterd/Manifest.txt
index 54bc2dc..44bf240 100644
--- a/cloud/Manifest.txt
+++ b/cloudmasterd/Manifest.txt
@@ -3,21 +3,21 @@ License.txt
 Manifest.txt
 README.txt
 Rakefile
-bin/cloud
-bin/cloud-ctl
+bin/cloudmasterd
+bin/cloudmasterd-ctl
 config.example.yml
 config/hoe.rb
 config/requirements.rb
-extra/cloud.redhat
-lib/cloud.rb
-lib/cloud/version.rb
+extra/cloudmasterd.redhat
+lib/cloudmasterd.rb
+lib/cloudmasterd/version.rb
 log/debug.log
 script/console
 script/destroy
 script/generate
 script/txt2html
 setup.rb
-spec/cloud.rb
+spec/cloudmasterd.rb
 spec/spec.opts
 spec/spec_helper.rb
 tasks/deployment.rake
diff --git a/cloud/README.txt b/cloudmasterd/README.txt
index 52e3511..6add78b 100644
--- a/cloud/README.txt
+++ b/cloudmasterd/README.txt
@@ -1,4 +1,4 @@
-= cloud
+= cloudmasterd
 
 * FIX (url)
 
diff --git a/cloud/Rakefile b/cloudmasterd/Rakefile
index e469154..e469154 100644
--- a/cloud/Rakefile
+++ b/cloudmasterd/Rakefile
diff --git a/cloud/bin/cloud b/cloudmasterd/bin/cloudmasterd
index ff14dc9..21b1f22 100644
--- a/cloud/bin/cloud
+++ b/cloudmasterd/bin/cloudmasterd
@@ -7,7 +7,7 @@ require 'rubygems'
 require 'picnic/cli'
 
 cli = Picnic::Cli.new(
-    'cloud',
+    'cloudmasterd',
     :app_path => File.expand_path(File.dirname(File.expand_path(__FILE__)))
 )
 
diff --git a/cloud/bin/cloud-ctl b/cloudmasterd/bin/cloudmasterd-ctl
index b38a487..5a79c24 100644
--- a/cloud/bin/cloud-ctl
+++ b/cloudmasterd/bin/cloudmasterd-ctl
@@ -3,6 +3,6 @@
 require 'rubygems'
 require 'picnic/service_control'
 
-ctl = Picnic::ServiceControl.new('cloud')
+ctl = Picnic::ServiceControl.new('cloudmasterd')
 
 ctl.handle_cli_input
diff --git a/cloud/config.example.yml b/cloudmasterd/config.example.yml
index 32aeeaf..fdfc900 100644
--- a/cloud/config.example.yml
+++ b/cloudmasterd/config.example.yml
@@ -84,5 +84,5 @@ port: 8107
 
 log:
   level: DEBUG
-  file: /var/log/cloud.log
+  file: /var/log/cloudmasterd.log
 #  level: INFO
diff --git a/cloud/config/hoe.rb b/cloudmasterd/config/hoe.rb
index 4b1c166..f76e707 100644
--- a/cloud/config/hoe.rb
+++ b/cloudmasterd/config/hoe.rb
@@ -1,10 +1,10 @@
-require 'cloud/version'
+require 'cloudmasterd/version'
 
 AUTHOR = 'Brenton Leanhardt'  # can also be an array of Authors
 EMAIL = "bleanhar@redhat.com"
 DESCRIPTION = "daemon for machine configuration"
-GEM_NAME = 'cloud' # what ppl will type to install your gem
-RUBYFORGE_PROJECT = 'cloud' # The unix name for your project
+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"
 DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
 
@@ -32,7 +32,7 @@ REV = nil
 # UNCOMMENT IF REQUIRED: 
 # REV = YAML.load(`svn info`)['Revision']
 VERS = Everestd::VERSION::STRING + (REV ? ".#{REV}" : "")
-RDOC_OPTS = ['--quiet', '--title', 'cloud documentation',
+RDOC_OPTS = ['--quiet', '--title', 'cloudmasterd documentation',
     "--opname", "index.html",
     "--line-numbers", 
     "--main", "README",
@@ -60,7 +60,7 @@ $hoe = Hoe.new(GEM_NAME, VERS) do |p|
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   p.extra_deps = ['picnic', 'activesupport', ['reststop', '>= 0.2.1'], 'everest']     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
   
-  p.spec_extras = {:executables => ['cloud', 'cloud-ctl']}    # A hash of extra values to set in the gemspec.
+  p.spec_extras = {:executables => ['cloudmasterd', 'cloudmasterd-ctl']}    # A hash of extra values to set in the gemspec.
   
 end
 
diff --git a/cloud/config/requirements.rb b/cloudmasterd/config/requirements.rb
index 9292b69..9292b69 100644
--- a/cloud/config/requirements.rb
+++ b/cloudmasterd/config/requirements.rb
diff --git a/cloud/extra/cloud.redhat b/cloudmasterd/extra/cloudmasterd.redhat
index 670ab9f..5059c72 100755
--- a/cloud/extra/cloud.redhat
+++ b/cloudmasterd/extra/cloudmasterd.redhat
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# cloud:        Init script for Cloud daemon.
+# cloudmasterd:        Init script for Cloud daemon.
 #
 # chkconfig: 35 91 03 
 #
@@ -12,18 +12,18 @@
 # Source function library.
 . /etc/init.d/functions
 
-CTL=cloud-ctl
+CTL=cloudmasterd-ctl
 
 [ -z "$HOME" ] && export HOME=/
 
 case "$1" in
     start)
-	echo -n $"Starting cloud: "
+	echo -n $"Starting cloudmasterd: "
         $CTL start
         RETVAL=$?
         ;;
     stop)
-	echo -n $"Stopping cloud: "
+	echo -n $"Stopping cloudmasterd: "
         $CTL stop
 	RETVAL=$?
         ;;
diff --git a/cloud/extra/cloud.spec b/cloudmasterd/extra/cloudmasterd.spec
index d309c3b..704c618 100644
--- a/cloud/extra/cloud.spec
+++ b/cloudmasterd/extra/cloudmasterd.spec
@@ -1,7 +1,7 @@
-# Generated from cloud-0.1.0.gem by gem2rpm -*- rpm-spec -*-
+# Generated from cloudmasterd-0.1.0.gem by gem2rpm -*- rpm-spec -*-
 %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
 %define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%define gemname cloud
+%define gemname cloudmasterd
 %define geminstdir %{gemdir}/gems/%{gemname}-%{version}
 
 Summary: daemon for machine configuration
@@ -10,7 +10,7 @@ Version: 0.1.1
 Release: 6%{?dist}
 Group: Development/Languages
 License: GPLv2+ or Ruby
-URL: http://cloud.rubyforge.org
+URL: http://cloudmasterd.rubyforge.org
 Source0: %{gemname}-%{version}.gem
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: rubygems
@@ -32,13 +32,13 @@ daemon for machine configuration
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{gemdir} %{buildroot}/etc/init.d %{buildroot}/etc/cloud
+mkdir -p %{buildroot}%{gemdir} %{buildroot}/etc/init.d %{buildroot}/etc/cloudmasterd
 gem install --local --install-dir %{buildroot}%{gemdir} \
             --force --rdoc %{SOURCE0}
 mkdir -p %{buildroot}/%{_bindir}
 mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
-mv %{buildroot}%{geminstdir}/extra/cloud.redhat %{buildroot}/etc/init.d/cloud
-mv %{buildroot}%{geminstdir}/config.example.yml %{buildroot}/etc/cloud/config.yml
+mv %{buildroot}%{geminstdir}/extra/cloudmasterd.redhat %{buildroot}/etc/init.d/cloudmasterd
+mv %{buildroot}%{geminstdir}/config.example.yml %{buildroot}/etc/cloudmasterd/config.yml
 rmdir %{buildroot}%{gemdir}/bin
 find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x
 
@@ -46,8 +46,8 @@ find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x
 rm -rf %{buildroot}
 
 %files
-%{_bindir}/cloud
-%{_bindir}/cloud-ctl
+%{_bindir}/cloudmasterd
+%{_bindir}/cloudmasterd-ctl
 %{gemdir}/gems/%{gemname}-%{version}/
 %doc %{gemdir}/doc/%{gemname}-%{version}
 %doc %{geminstdir}/History.txt
@@ -57,10 +57,10 @@ rm -rf %{buildroot}
 %doc %{geminstdir}/website/index.txt
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
-%config /etc/cloud/config.yml
+%config /etc/cloudmasterd/config.yml
 
 %defattr(755, root, root, -)
-/etc/init.d/cloud
+/etc/init.d/cloudmasterd
 
 %changelog
 * Thu Apr 24 2008  <bleanhar@bleanhar-jboss-dev.usersys.redhat.com> - 0.1.0-1
diff --git a/cloud/lib/cloud.rb b/cloudmasterd/lib/cloudmasterd.rb
index 70b4e19..14f9fcd 100644
--- a/cloud/lib/cloud.rb
+++ b/cloudmasterd/lib/cloudmasterd.rb
@@ -11,10 +11,14 @@ require 'everest'
 require 'restr'
 require 'xmlrpc/client'
 
-Camping.goes :Cloud
-Cloud.picnic!
+Camping.goes :Cloudmasterd
+Cloudmasterd.picnic!
 
-module Cloud::Helpers
+module Cloudmasterd::Model
+
+end
+
+module Cloudmasterd::Helpers
   class Cobblerd
     def initialize(repo)
       @repo = repo
@@ -77,11 +81,11 @@ module Cloud::Helpers
   end
 end
   
-module Cloud::Controllers
+module Cloudmasterd::Controllers
   class Koan < REST 'koan'
     # Retrieve the cobbler profile for the given profile name
     def _get_cobbler_profile(system_name, repo) 
-      cobblerd = Cloud::Helpers::Cobblerd.new(repo)
+      cobblerd = Cloudmasterd::Helpers::Cobblerd.new(repo)
       cobbler_system = cobblerd.system(system_name)
       return cobblerd.profile(cobbler_system["profile"])
     end
@@ -89,14 +93,14 @@ module Cloud::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(':')
+      return `func-find-resources -m #{ram} -d #{disk_size}`.split(':')[0]
     end
 
     # run the appropriate koan command to create the given "fqdn"
     # on the given "host" and "vol_group"
-    def _koan(host, vol_group, fqdn, repo)
+    def _koan(host, fqdn, repo)
       # Run the koan process
-      func_cmd = "func \"#{host}\" call virt install #{repo} #{fqdn} True #{fqdn.split('.')[0]} #{vol_group}"
+      func_cmd = "func \"#{host}\" call virt install #{repo} #{fqdn} True #{fqdn} /images"
       puts `#{func_cmd}`
 
       # Make the new host autostart
@@ -110,14 +114,14 @@ module Cloud::Controllers
       repo = input.repo
 
       cobbler_profile = _get_cobbler_profile(machine_fqdn, repo)
-      @host, vol_group = _get_best_host(cobbler_profile["virt_file_size"], cobbler_profile["virt_ram"])
-      _koan(@host, vol_group, machine_fqdn, repo)
+      @host = _get_best_host(cobbler_profile["virt_file_size"], cobbler_profile["virt_ram"])
+      _koan(@host, machine_fqdn, repo)
       render :_koan
     end
   end
 end
 
-module Cloud::Views
+module Cloudmasterd::Views
   def initialize(*args)
     super(*args)
     @x = Builder::XmlMarkup.new(:indent => 1)
@@ -127,7 +131,7 @@ module Cloud::Views
     def layout
       html do
         head do
-          title 'Everest Cloud Controller'
+          title 'Everest Cloud Master Controller'
           #link :rel => 'stylesheet', :type => 'text/css', 
           #:href => self/'/styles.css', :media => 'screen'
         end
@@ -161,6 +165,6 @@ module Cloud::Views
 end
 
 # Required by picnic
-def Cloud.create; end
+def Cloudmasterd.create; end
 
-Cloud.start_picnic
+Cloudmasterd.start_picnic
diff --git a/cloud/lib/cloud/version.rb b/cloudmasterd/lib/cloudmasterd/version.rb
index cf75a7b..ec2eb9c 100644
--- a/cloud/lib/cloud/version.rb
+++ b/cloudmasterd/lib/cloudmasterd/version.rb
@@ -1,4 +1,4 @@
-module Cloud #:nodoc:
+module Cloudmasterd #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
diff --git a/cloud/log/debug.log b/cloudmasterd/log/debug.log
index e69de29..e69de29 100644
--- a/cloud/log/debug.log
+++ b/cloudmasterd/log/debug.log
diff --git a/cloud/script/console b/cloudmasterd/script/console
index ef928b7..cc9f73f 100755
--- a/cloud/script/console
+++ b/cloudmasterd/script/console
@@ -5,6 +5,6 @@ irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
 libs =  " -r irb/completion"
 # Perhaps use a console_lib to store any extra methods I may want available in the cosole
 # libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
-libs <<  " -r #{File.dirname(__FILE__) + '/../lib/cloud.rb'}"
-puts "Loading cloud gem"
+libs <<  " -r #{File.dirname(__FILE__) + '/../lib/cloudmasterd.rb'}"
+puts "Loading cloudmasterd gem"
 exec "#{irb} #{libs} --simple-prompt"
diff --git a/cloud/script/destroy b/cloudmasterd/script/destroy
index e48464d..e48464d 100755
--- a/cloud/script/destroy
+++ b/cloudmasterd/script/destroy
diff --git a/cloud/script/generate b/cloudmasterd/script/generate
index c27f655..c27f655 100755
--- a/cloud/script/generate
+++ b/cloudmasterd/script/generate
diff --git a/cloud/script/txt2html b/cloudmasterd/script/txt2html
index 8190daa..1682173 100755
--- a/cloud/script/txt2html
+++ b/cloudmasterd/script/txt2html
@@ -11,10 +11,10 @@ end
 require 'redcloth'
 require 'syntax/convertors/html'
 require 'erb'
-require File.dirname(__FILE__) + '/../lib/cloud/version.rb'
+require File.dirname(__FILE__) + '/../lib/cloudmasterd/version.rb'
 
 version  = Everestd::VERSION::STRING
-download = 'http://rubyforge.org/projects/cloud'
+download = 'http://rubyforge.org/projects/cloudmasterd'
 
 class Fixnum
   def ordinal
diff --git a/cloud/setup.rb b/cloudmasterd/setup.rb
index 424a5f3..424a5f3 100644
--- a/cloud/setup.rb
+++ b/cloudmasterd/setup.rb
diff --git a/cloud/spec/cloud_spec.rb b/cloudmasterd/spec/cloudmasterd_spec.rb
index a52055a..a52055a 100644
--- a/cloud/spec/cloud_spec.rb
+++ b/cloudmasterd/spec/cloudmasterd_spec.rb
diff --git a/cloud/spec/spec.opts b/cloudmasterd/spec/spec.opts
index 53607ea..53607ea 100644
--- a/cloud/spec/spec.opts
+++ b/cloudmasterd/spec/spec.opts
diff --git a/cloud/spec/spec_helper.rb b/cloudmasterd/spec/spec_helper.rb
index 63ce735..ecb7350 100644
--- a/cloud/spec/spec_helper.rb
+++ b/cloudmasterd/spec/spec_helper.rb
@@ -7,4 +7,4 @@ rescue LoadError
 end
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'cloud'
+require 'cloudmasterd'
diff --git a/cloud/tasks/deployment.rake b/cloudmasterd/tasks/deployment.rake
index 2f43742..2f43742 100644
--- a/cloud/tasks/deployment.rake
+++ b/cloudmasterd/tasks/deployment.rake
diff --git a/cloud/tasks/environment.rake b/cloudmasterd/tasks/environment.rake
index 691ed3b..691ed3b 100644
--- a/cloud/tasks/environment.rake
+++ b/cloudmasterd/tasks/environment.rake
diff --git a/cloud/tasks/rspec.rake b/cloudmasterd/tasks/rspec.rake
index 2415fa4..2415fa4 100644
--- a/cloud/tasks/rspec.rake
+++ b/cloudmasterd/tasks/rspec.rake
diff --git a/cloud/tasks/website.rake b/cloudmasterd/tasks/website.rake
index 93e03fa..93e03fa 100644
--- a/cloud/tasks/website.rake
+++ b/cloudmasterd/tasks/website.rake
diff --git a/cloud/website/index.html b/cloudmasterd/website/index.html
index e9a483a..524cdcb 100644
--- a/cloud/website/index.html
+++ b/cloudmasterd/website/index.html
@@ -1,11 +1,11 @@
 <html>
 	<head>
 		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
-		<title>cloud</title>
+		<title>cloudmasterd</title>
 		
 	</head>
 	<body id="body">
-		<p>This page has not yet been created for RubyGem <code>cloud</code></p>
+		<p>This page has not yet been created for RubyGem <code>cloudmasterd</code></p>
 		<p>To the developer: To generate it, update website/index.txt and run the rake task <code>website</code> to generate this <code>index.html</code> file.</p>
 	</body>
 </html>
diff --git a/cloud/website/index.txt b/cloudmasterd/website/index.txt
index f7fdf9d..64f06c2 100644
--- a/cloud/website/index.txt
+++ b/cloudmasterd/website/index.txt
@@ -1,6 +1,6 @@
-h1. cloud
+h1. cloudmasterd
 
-h1. &#x2192; 'cloud'
+h1. &#x2192; 'cloudmasterd'
 
 
 h2. What
@@ -8,7 +8,7 @@ h2. What
 
 h2. Installing
 
-<pre syntax="ruby">sudo gem install cloud</pre>
+<pre syntax="ruby">sudo gem install cloudmasterd</pre>
 
 h2. The basics
 
@@ -19,15 +19,15 @@ h2. Demonstration of usage
 
 h2. Forum
 
-"http://groups.google.com/group/cloud":http://groups.google.com/group/cloud
+"http://groups.google.com/group/cloudmasterd":http://groups.google.com/group/cloudmasterd
 
-TODO - create Google Group - cloud
+TODO - create Google Group - cloudmasterd
 
 h2. How to submit patches
 
 Read the "8 steps for fixing other people's code":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/ and for section "8b: Submit patch to Google Groups":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups, use the Google Group above.
 
-The trunk repository is <code>svn://rubyforge.org/var/svn/cloud/trunk</code> for anonymous access.
+The trunk repository is <code>svn://rubyforge.org/var/svn/cloudmasterd/trunk</code> for anonymous access.
 
 h2. License
 
@@ -35,5 +35,5 @@ This code is free to use under the terms of the MIT license.
 
 h2. Contact
 
-Comments are welcome. Send an email to "Brenton Leanhardt":mailto:bleanhar@redhat.com via the "forum":http://groups.google.com/group/cloud
+Comments are welcome. Send an email to "Brenton Leanhardt":mailto:bleanhar@redhat.com via the "forum":http://groups.google.com/group/cloudmasterd
 
diff --git a/cloud/website/javascripts/rounded_corners_lite.inc.js b/cloudmasterd/website/javascripts/rounded_corners_lite.inc.js
index afc3ea3..afc3ea3 100644
--- a/cloud/website/javascripts/rounded_corners_lite.inc.js
+++ b/cloudmasterd/website/javascripts/rounded_corners_lite.inc.js
diff --git a/cloud/website/stylesheets/screen.css b/cloudmasterd/website/stylesheets/screen.css
index 2c84cd0..2c84cd0 100644
--- a/cloud/website/stylesheets/screen.css
+++ b/cloudmasterd/website/stylesheets/screen.css
diff --git a/cloud/website/template.html.erb b/cloudmasterd/website/template.html.erb
index b279c36..b279c36 100644
--- a/cloud/website/template.html.erb
+++ b/cloudmasterd/website/template.html.erb