poolparty 1.2.2 → 1.3.1

data/README.rdoc

@@ -0,0 +1,202 @@
+= PoolParty
+
+http://poolpartyrb.com
+
+== DESCRIPTION:
+
+PoolParty makes cloud provisioning and management easy. PoolParty provides a unified interface for provisioning, management and cloud life-cycle on many different cloud providers, such as EC2 and vmware.
+
+Code your cloud! 
+
+== SYNOPSIS:
+
+PoolParty is written with the intention of being as application-agnostic as possible. It installs only the basic 
+required software to glue the cloud together on the instances as listed below.
+
+== Quickstart
+
+For instance, to start a basic cloud, let's write one:
+
+  pool "demo" do
+    cloud "app" do
+      instances 2..10
+      keypair "cloud_demo"
+      
+      using :ec2
+      
+      has_file "/etc/motd", :content => "Hello from your cloud"
+    end
+  end
+  
+Simply by issuing the command:
+  
+  cloud start
+  
+The app cloud in the demo pool will be started, bootstrapped and provisioned to your liking. If the platform is not specified, then it's assumed to be ubuntu. However, if a node is running, then PoolParty will introspect the node and determine the operating system. This can be specified in the clouds.rb.
+
+There are a number of commands PoolParty offers to interact with your cloud. They include:
+
+* <tt>cloud start</tt>
+* <tt>cloud terminate</tt>
+* <tt>cloud bootstrap</tt>
+* <tt>cloud configure</tt>
+* <tt>cloud compile</tt>
+* <tt>cloud console</tt>
+* <tt>cloud expand</tt>
+* <tt>cloud contract</tt>
+* <tt>cloud list</tt>
+* <tt>cloud show</tt>
+* <tt>cloud ssh</tt>
+
+There is also a helper installer script. This is an easy way to get started bootstrapping your environment:
+
+* <tt>install-poolparty</tt>
+
+We can change the cloud provider simply by changing the using line. For instance:
+
+  pool "demo" do
+    cloud "app" do
+      #...
+      using :rackspace # coming soon
+      #...
+
+Clouds are distinguished by keypairs, so to create multiple clouds, create a new keypair. For instance:
+
+  pool "demo" do
+    cloud "app" do
+      keypair "demo_app"
+      #...
+    end
+    cloud "db" do
+      keypair "demo_db"
+      #...
+    end
+  end
+  
+== Resources
+
+As you probably noticed from above, you provision your system with resources. There are native resources, plugins (which are basically resources) and you can write your own. The base resources included in PoolParty are as follows:
+
+* <tt>file</tt>
+* <tt>directory</tt>
+* <tt>exec</tt>
+* <tt>variable</tt>
+* <tt>service</tt>
+* <tt>package</tt>
+* <tt>user</tt>
+* <tt>group</tt>
+* <tt>link (symlink)</tt>
+* <tt>line (line in file)</tt>
+* <tt>gem_package</tt>
+* <tt>cron</tt>
+
+There are also dependency_resolver specific resources. For instance, **chef** specific resources are as follows:
+
+* <tt>chef_attribute</tt>
+* <tt>http_request</tt>
+* <tt>remote_directory</tt>
+* <tt>remote_file</tt>
+* <tt>route</tt>
+* <tt>script</tt>
+
+To use these resources in your config file (clouds.rb), simply "assert" (call) the method with has_ or does_not_have prepended. For instance:
+
+  pool "demo" do
+    cloud "app" do
+      has_file "/etc/motd", :requires => get_package("apache2")
+      has_package "apache2" do
+        action :install
+      end
+    end
+  end
+  
+As you can see, there are many different ways to call a resource. All the following resource calls are identical:
+
+  has_file "/etc/motd", :content => "Hello world", :owner => "ari"
+  has_file :name => "/etc/motd", :content => "Hello world", :owner => "ari"
+  has_file "/etc/motd" do
+    content "Hello world"
+    owner "ari"
+  end
+  has_file "/etc/motd", :content => "Hello world" do
+    owner "ari"
+  end
+  
+All resources can contain their own resources as well. This sets up a dependency on the parent dependency. For instance
+
+  has_directory "/etc/configs" do
+    has_file "/etc/configs/configger", :content => "Stuff"
+  end
+
+This says that the directory must exist before the file can be created.
+
+You can see the dependency graph setup by your clouds.rb by calling
+
+  cloud compile -g output
+  
+That will generate a output.dot and output.png in the current directory. For this to work, you must have dot installed. Try it!
+
+Resources can be built on top of other resources as well. This is the definition of a resource plugin. This is covered more in-depth on the homepage. For the curious, take a look at lib/poolparty/plugins/apache.rb for an example plugin. 
+
+There are currently several plugins that ship with PoolParty. Those include:
+
+* <tt>apache (this includes passenger, virtual_hosts, php5)</tt>
+* <tt>git</tt>
+* <tt>rails</tt>
+
+This is list likely to expand as plugins are simply resources built on top of other resources. There is an external project called poolparty-extensions (<a href="http://github.com/auser/poolparty-extensions/tree/master">http://github.com/auser/poolparty-extensions/tree/master</a>) that has quite a few external plugins, including hadoop, ganglia and more.
+
+== Extending
+
+To add a cloud_provider, there are four methods that need to be implemented. Simply sublcass the CloudProviders module and require it in your clouds.rb (or commit it back to PoolParty). Those four methods are:
+
+* <tt>run_instance</tt>
+* <tt>terminate_instance</tt>
+* <tt>describe_instances</tt>
+* <tt>describe_instance</tt>
+
+That's it!
+
+Each resource is documented in the code and more documentation can be found at the site: <a href="http://poolpartyrb.com">http://poolpartyrb.com</a>.
+
+== FEATURES/PROBLEMS:
+
+* Written in Ruby and Erlang (Internal node communication handled by <a href="https://github.com/auser/hermes/tree/master">Hermes</a>)
+* Thrift interface (Connect to your cloud in ANY language supported by <a href="http://incubator.apache.org/thrift/">Thrift</a>)
+* Written from the ground up to be extensible with plugins
+* Easy git-style commands to communicate with your clouds
+* Much much more
+
+== REQUIREMENTS:
+
+* Ruby
+* Erlang
+
+== INSTALL:
+
+sudo gem install auser-poolparty
+
+== LICENSE:
+
+(The MIT License)
+
+Copyright (c) 2009 Ari Lerner, CloudTeam
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -2,7 +2,7 @@ require 'config/requirements'
 
 begin
   require 'hanna/rdoctask'
-rescue Exception => e
+rescue LoadError => e
   require "rake/rdoctask"
 end
 
@@ -26,31 +26,17 @@ task :clean_pkg do |t|
   end
 end
 
-desc "Packge with timestamp"
-task :update_timestamp do
-  data = open("PostInstall.txt").read
-  str = "Updated at #{Time.now.strftime("%H:%M %D")}"
-  
-  if data.scan(/Updated at/).empty?
-    data = data ^ {:updated_at => str}    
-  else
-    data = data.gsub(/just installed PoolParty\!(.*)$/, "just installed PoolParty! (#{str})")
-  end
-  ::File.open("PostInstall.txt", "w+") {|f| f << data }
-end
 
 namespace :gem do
   task(:build).prerequisites.unshift :gemspec # Prepend the gemspec generation
   
-  desc "Build the gem only if the specs pass"
-  task :test_then_build => [:spec, :build]
+  desc "Build the gem only if the tests pass"
+  task :test_then_build => [:test, :build]
   
-  desc "Build and install the gem only if the specs pass"
-  task :test_then_install => [:spec, :install]
+  desc "Build and install the gem only if the tests pass"
+  task :test_then_install => [:test, :install]
 end
 
-task :release => [:update_timestamp]
-
 # Generate documentation
 Rake::RDocTask.new do |rd|
   rd.main = "Readme.txt"

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 2
-:patch: 2
+:patch: 1
 :major: 1
+:minor: 3

data/bin/cloud

@@ -1,52 +1,54 @@
 #!/usr/bin/env ruby
-$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+$:.unshift(File.dirname(__FILE__) + "/../lib")
 require "poolparty"
-require "poolpartycl"
-
-# name = ARGV.select {|arg| arg if Binary.available_binaries_for("cloud").include?(arg) }.first
-name = ARGV.shift if Binary.available_binaries_for("cloud").include?(ARGV.first)
-# If the options include -h and they don't include a valid command, then we can just pass the 
-# original options back, but if they do contain a binary, we don't want -h getting through to 
-# these options, so we'll strip it if it's included
-DUP_ARG = ARGV.dup
-new_args = DUP_ARG.map {|arg| DUP_ARG.delete(arg) unless help_array.include?(arg) || Binary.available_binaries_for("cloud").include?(arg) }
-new_args = new_args.reject {|arg| Binary.available_binaries_for("cloud").include?(arg) }.empty? ? ARGV : (name ? (help_array.each {|arg| DUP_ARG.delete(arg)}; DUP_ARG) : DUP_ARG)
-
-# Let's make sure if no command is passed in that we show the help message
-new_args.push("-h") unless name
-
-# Binary.list_binaries_for("cloud")
-extra_help_string = <<-EOE
-
-  Cloud commands
-    cloud start       starts a single instance in your cloud.
-    cloud bootstrap   bootstraps an instance or multiple instances
-    cloud configure   configures an instance or multiple instances
-    cloud provision   combines bootstrap and configures an instance or multiple instances
-    cloud expand      expands the cloud by a single instance
-    cloud contract    contracts the cloud by a single instance
-    cloud describe    show the configuration of the current clouds.rb configuration file
-    cloud list        show a list of the current instances on the cloud
-    cloud show        shows output about the clouds.rb
-    cloud ssh         ssh into an instance of the cloud
-    cloud terminate   terminate the cloud
+require "colors"
+require "mixins/printing"
+require 'git-style-binary/command'
+
+GitStyleBinary.primary do
+  self.class.send :include, Printing
+  
+  @theme = :short
+  
+  version "PoolParty release: #{PoolParty.version}"
+  banner <<-EOS
+Usage: #{$0} #{all_options_string} COMMAND [ARGS]
+
+The cloud subcommands commands are:
+  \#{GitStyleBinary.pretty_known_subcommands(:short).join("  ")}
+
+See 'cloud help COMMAND' for more information on a specific command.
+EOS
     
-EOE
-
-o = PoolParty::Optioner.new(new_args, {
-  :extra_help => extra_help_string,
-  :abstract => true}) do |opts, optioner|  
-  opts.on('-n cloudname', '--name name', 'Address this cloud')    { |c| optioner.cloudname c }
-end
-
-program_name = "#{File.basename($0)}-#{name}"
-program_location = File.join(Binary.binary_directory, program_name)
-
-command_line = "#{program_location}"
+  opt :clouds_dot_rb, "Set the clouds.rb file", :type => String, :default => "clouds.rb"
+  opt :very_verbose, "Set very verbose mode on", :type => :boolean, :default => false
+  opt :debug, "Debug the output", :type => :boolean, :default => false
+  opt :very_debug, "Set very debug mode on", :type => :boolean, :default => false
+  opt :name, "Name of the working cloud", :type => String, :default => nil
+
+  before_run do |command|
+    # Setup testing/debugging
+    $TESTING        = true if command[:verbose]
+    $VERY_VERBOSE   = true if command[:very_verbose]
+    $DEBUGGING      = true if command[:debug]
+    $VERY_DEBUGGING = true if command[:very_debug]
+    
+    @loaded_pool = PoolParty::Pool.find_and_load_default_clouds_dot_rb(command[:clouds_dot_rb])
+    @loaded_clouds = command[:name] ? [clouds[command[:name]]] : @loaded_pool.clouds.map {|name,cld|cld}
+    @loaded_clouds.map do |cld| 
+      cld.verbose = command[:verbose]
+      cld.debug = command[:debug]
+    end
+  end
+  
+  run do |command|
+    subcommands = GitStyleBinary.list_subcommands
+    
+    puts "Usage: cloud COMMAND [ARGS]
+    
+    The cloud subcommands commands are:
+      #{subcommands}
 
-# Run it from the command-line first
-if Binary.available_binaries_for("cloud").include?(name)
-  system command_line, *new_args
-else
-  puts "Unknown poolparty binary: #{name}"
+    See 'cloud help COMMAND' for more information on a specific command"
+  end
 end

data/bin/cloud-bootstrap

@@ -1,31 +1,30 @@
 #!/usr/bin/env ruby
-$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+$:.unshift(File.dirname(__FILE__) + "/../lib")
 require "poolparty"
-require "poolparty/provision/boot_strapper"
 
+require 'git-style-binary/command'
 
-o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-  opts.on('-n cloudname', '--name name', 'Start cloud by this name')    { |c| optioner.cloudname c }
-  opts.on('-i num', '--num i', 'Instance number')    { |i| optioner.inst_num i.to_i }
-end
+GitStyleBinary.command do
+  banner <<-EOS
+Usage: #{$0} #{all_options_string}
 
-o.loaded_clouds.each do |cld|
-  # If an IP or DNS name is given, bootstrap that node, otherwise, bootstrap all running nodes.
-  # ::FileUtils.rm_rf "#{Default.tmp_path}/" unless o.testing?
+  Bootstrap a cloud instance
+EOS
+
+  short_desc "Bootstrap a cloud instance"
   
-  nodes = !o.unflagged_args.empty? ?  o.unflagged_args : cld.nodes(:status => "running").collect {|i| i.ip }.sort.compact
-  if nodes.empty?
-    puts "No nodes to bootstrap"
-  else
-    if o.inst_num?
-      vputs "\nBootStrapping: #{nodes[o.inst_num]}\n--------------------"
-      ::PoolParty::Provision::BootStrapper.new nodes[o.inst_num], :cloud => cld
-    else
-      nodes.each do |address|
-        vputs "\nBootStrapping: #{address}\n--------------------"      
-        ::PoolParty::Provision::BootStrapper.new address, :cloud => cld
+  opt :inst_num, "The number of the instance to run bootstrap on", :type => :int
+  opt :force, "Force rebootstrapping (useful for upgrading)", :default => false
+
+  run do |command|
+    
+    @loaded_clouds.each do |cld|
+      
+      cld.nodes.each do |node|
+        node.bootstrap!(:force=>command[:force])
       end
+      
     end
+    
   end
-end
-
+end

data/bin/cloud-compile

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+$:.unshift(File.dirname(__FILE__) + "/../lib")
+require "poolparty"
+
+require 'git-style-binary/command'
+
+GitStyleBinary.command do
+  banner <<-EOS
+Usage: #{$0} #{all_options_string}
+
+  Configure a cloud instance
+EOS
+
+  short_desc "Configure a cloud instance"
+  
+  opt :inst_num, "The number of the instance to run bootstrap on", :type => :int
+  opt :generate_graph, "Generate the dependency tree graph", :type => :string, :default => nil
+
+  run do |command|
+    
+    @loaded_clouds.each do |cld|
+      
+      cld.compile
+      
+      if command[:generate_graph]
+        vputs "Generating dependency graph at: #{command[:generate_graph]}"
+        cld.output_resources_graph('png', command[:generate_graph], {"fontsize" => 30})
+      end
+      
+    end
+    
+  end
+end

data/bin/cloud-configure

@@ -1,43 +1,35 @@
 #!/usr/bin/env ruby
-$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+$:.unshift(File.dirname(__FILE__) + "/../lib")
 require "poolparty"
 
-extra_help_string = <<-EOE
+require 'git-style-binary/command'
 
-  Cloud configure
-  
-    Cloud configure will repackage the deployment and send it off to a 
-    remote instance from within the cloud. It then will reconfigure
-    itself and alert the rest of the cloud
-    
-EOE
+GitStyleBinary.command do
+  banner <<-EOS
+Usage: #{$0} #{all_options_string}
 
-o = PoolParty::Optioner.new(ARGV, {:extra_help => extra_help_string}) do |opts, optioner|
-  opts.on('-n cloudname', '--name name', 'Start cloud by this name')    { |c| optioner.cloudname c }
-  opts.on('-i num', '--num i', 'Instance number')    { |i| optioner.inst_num i.to_i }
-end
+  Configure a cloud instance
+EOS
 
-o.loaded_clouds.each do |cld|
-  # If an IP or DNS name is given, bootstrap that node, otherwise, bootstrap all running nodes.
-  # ::FileUtils.rm_rf "#{Default.tmp_path}/" unless o.testing?
+  short_desc "Configure a cloud instance"
   
-  if cld.nodes(:status => "running").size < 1
-    puts header("No instances running")
-  else
-    nodes = !o.unflagged_args.empty? ?  o.unflagged_args : cld.nodes(:status => "running").collect {|i| i.ip }.sort.compact
-    if nodes.empty?
-      puts "No nodes to configure"
-    else
-      if o.inst_num?
-        vputs "Configuring #{nodes[o.inst_num]}"
-        ::PoolParty::Provision::DrConfigure.new( nodes[o.inst_num], :cloud => cld )
-      else
-        nodes.each do |address|
-          puts "Configuring: #{address}"
-          ::PoolParty::Provision::DrConfigure.new( address, :cloud => cld )
-        end
+  opt :inst_num, "The number of the instance to run bootstrap on", :type => :int
+  opt :generate_graph, "Generate the dependency tree graph", :type => :string, :default => nil
+
+  run do |command|
+    
+    @loaded_clouds.each do |cld|
+      
+      if command[:generate_graph]
+        vputs "Generating dependency graph at: #{command[:generate_graph]}"
+        cld.output_resources_graph('png', command[:generate_graph], {"fontsize" => 30})
       end
+      
+      cld.nodes.each do |node|
+        node.configure!(:cloud => cld)
+      end
+      
     end
+    
   end
-end
-
+end

data/bin/cloud-console

@@ -1,12 +1,36 @@
 #!/usr/bin/env ruby
-# File: script/console
-irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
+$:.unshift(File.dirname(__FILE__) + "/../lib")
+require "poolparty"
 
-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/poolparty.rb'}"
-libs <<  " -r #{File.dirname(__FILE__) + '/../lib/poolpartycl.rb'}"
-puts "Loading PoolParty console..."
+require 'git-style-binary/command'
 
-exec "#{irb} #{libs} --simple-prompt"
+GitStyleBinary.command do
+  banner <<-EOS
+Usage: #{$0} #{all_options_string}
+
+  Open an irb session with the clouds.rb loaded
+EOS
+
+  short_desc "Open an irb session with clouds.rb loaded"
+  
+  opt :inst_num, "The number of the instance to run bootstrap on", :type => :int
+
+  run do |command|    
+    
+    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/poolparty.rb'}"
+    f = command[:clouds_dot_rb]
+    libs <<  " -r " + if File.file?(f)
+      f
+    else
+      "#{PoolParty::Pool.find_default_clouds_dot_rb('clouds.rb')}"
+    end
+    puts "Loading PoolParty console..."
+    exec "#{irb} #{libs} --simple-prompt"
+    
+  end
+end

data/bin/cloud-contract

@@ -1,17 +1,37 @@
 #!/usr/bin/env ruby
-$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+$:.unshift(File.dirname(__FILE__) + "/../lib")
 require "poolparty"
-require "poolpartycl"
 
-o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-  opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
-end
+require 'git-style-binary/command'
 
-o.loaded_clouds.each do |cld|  
-  puts header("Contracting cloud #{cld.name}")
-  puts "#{cld.nodes(:status => "running").size} running instances (#{cld.minimum_instances} minimum instances)"
-  puts testing ? "Not contracting (test mode)" : "Contracting the cloud if possible"
+GitStyleBinary.command do  
+  banner <<-EOS
+Usage: #{$0} #{all_options_string}
 
-  last_instance_id = cld.nodes(:status => "running").last[:instance_id]
-  cld.remote_base.terminate_instance! cld.options.merge(:instance_id => last_instance_id)
+  contracts the cloud by a single instance
+EOS
+
+  short_desc "contracts the cloud by a single instance"
+
+  run do |command|    
+    @loaded_clouds.each do |cld|
+      
+      node_to_terminate = cld.nodes.last
+      
+      msg = [
+        "Contracting cloud #{cld.name} (#{cld.keypair}) by 1",
+        " node: #{node_to_terminate.public_ip}"
+      ]
+      
+      print_msg(msg)
+      
+      node_to_terminate.terminate!
+      
+      msg = [
+        "#{node_to_terminate.public_ip} has been terminated"
+      ]
+      
+      print_msg(msg)
+    end    
+  end
 end

data/bin/cloud-expand

@@ -1,26 +1,38 @@
 #!/usr/bin/env ruby
-$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+$:.unshift(File.dirname(__FILE__) + "/../lib")
 require "poolparty"
-require "poolpartycl"
 
-o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-  opts.on('-n name', '--name name', 'Expand the cloud on this name')    { |c| optioner.cloudname c }
-end
+require 'git-style-binary/command'
 
-o.loaded_clouds.each do |cld|
+GitStyleBinary.command do  
+  banner <<-EOS
+Usage: #{$0} #{all_options_string}
 
-  vputs header("Expanding cloud #{cld.name}")
-  vputs "#{cld.nodes(:status => "running").size} running instances of #{cld.maximum_instances} possible instances"
-  vputs testing ? "Not expanding (test mode)" : "Expanding the cloud"
-  
-  cld.launch_instance! do |node|
-    ::PoolParty::Provision::BootStrapper.new(node.ip, :cloud => cld)
-    ::PoolParty::Provision::DrConfigure.new(node.ip,  :cloud => cld)
+  expands the cloud by a single instance
+EOS
+
+  short_desc "expands the cloud by a single instance"
+
+  run do |command|    
+    @loaded_clouds.each do |cld|
+      
+      msg = [
+        "Expanding cloud #{cld.name} (#{cld.keypair})",
+        "#{cld.nodes.size} running instances (#{cld.minimum_instances} - #{cld.maximum_instances})"
+      ]
+      
+      print_msg(msg)
+      
+      inst = cld.expand
+      inst.bootstrap!
+      
+      msg = [
+        "Your cloud has expanded by node: #{inst.public_ip}"
+      ]
+      
+      print_msg(msg)
+
+    end
     
-    puts <<-EOM
-      Your cloud has expanded. The new ip is #{node.ip}
-    EOM
   end
-  
-  
 end