auser-poolparty 0.2.44 → 0.2.45

data/Manifest.txt

@@ -25,7 +25,6 @@ bin/pool
 bin/pool-console
 bin/pool-describe
 bin/pool-list
-bin/pool-provision
 bin/pool-spec
 bin/pool-start
 bin/server-build-messenger
@@ -311,6 +310,7 @@ lib/poolparty/core/symbol.rb
 lib/poolparty/core/time.rb
 lib/poolparty/dependency_resolutions/base.rb
 lib/poolparty/dependency_resolutions/puppet.rb
+lib/poolparty/exceptions/CloudNotFoundException.rb
 lib/poolparty/exceptions/LoadRulesException.rb
 lib/poolparty/exceptions/MasterException.rb
 lib/poolparty/exceptions/RemoteException.rb
@@ -326,6 +326,7 @@ lib/poolparty/helpers/optioner.rb
 lib/poolparty/helpers/provisioner_base.rb
 lib/poolparty/helpers/provisioners/master.rb
 lib/poolparty/helpers/provisioners/slave.rb
+lib/poolparty/modules/cloud_dsl.rb
 lib/poolparty/modules/cloud_resourcer.rb
 lib/poolparty/modules/configurable.rb
 lib/poolparty/modules/definable_resource.rb
@@ -365,6 +366,7 @@ lib/poolparty/pool/resources/exec.rb
 lib/poolparty/pool/resources/file.rb
 lib/poolparty/pool/resources/gem_package.rb
 lib/poolparty/pool/resources/host.rb
+lib/poolparty/pool/resources/mount.rb
 lib/poolparty/pool/resources/package.rb
 lib/poolparty/pool/resources/remote_file.rb
 lib/poolparty/pool/resources/service.rb

data/bin/cloud

@@ -3,28 +3,18 @@ $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
 
-# # Get the git-style program action
-# o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-#   opts.on('-n [name]','--name [name]', 'Binary to run')    { |o| optioner.name o }
-#   
-#   opts.banner = <<-EOB
-#   Usage: cloud <specfile> <action> <options>
-#   Cloud actions:
-#   #{Binary.list_binaries_for("cloud")}
-#   EOB
-# end
+name = ARGV.select {|arg| arg if Binary.available_binaries_for("cloud").include?(arg) }.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.reject {|arg| Binary.available_binaries_for("cloud").include?(arg) }.empty? ? ARGV : (name ? (DUP_ARG.delete("-h"); DUP_ARG) : DUP_ARG)
 
-name = ARGV.shift
+# Let's make sure if no command is passed in that we show the help message
+new_args.push("-h") unless name
 
-# If there was no program action given
-if !name || name == "-h" || name == "--help"
-  puts "Binary required"
-  puts <<-EOB
-    Usage: cloud <specfile> <action> <options>
-    Cloud actions:
-    #{Binary.list_binaries_for("cloud")}
-    EOB
-  exit
+o = PoolParty::Optioner.new(new_args, {:extra_help => "\nCloud actions\n#{Binary.list_binaries_for("cloud")}\n\n", :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}"
@@ -36,5 +26,5 @@ command_line = "#{program_location}"
 if Binary.available_binaries_for("cloud").include?(name)
   system command_line, *ARGV
 else
-  puts "Unknown poolparty binary: #{program_name}"
+  puts "Unknown poolparty binary: #{name}"
 end

data/bin/cloud-add-keypair

@@ -2,22 +2,27 @@
 $:.unshift(File.join(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 }
+  opts.on('-n name', '--name name', 'Add the keypair for cloud name')    { |c| optioner.cloudname c }
+  opts.on('-l', '--listing', 'List the keypairs for the clouds')    { optioner.listkeys true }
 end
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-@location = o.location ? o.location : "remote"
-
-include Remote
 
-@clouds = o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds
-
-@clouds.each do |name, cloud|
+if o.listkeys
+  
+  puts "Cloud\t\tKeypair"
+  puts "--------------------------"
+  o.loaded_clouds.each do |cloud|
+    puts "#{cloud.name}\t--\t#{cloud.keypair}"
+  end
+  
+else
   
-  with_cloud(cloud, {:location => @location, :verbose => o.verbose}) do
-    vputs header("Creating keypair for #{name}")
-    create_keypair unless testing
-  end  
+  o.loaded_clouds.each do |cloud|  
+    with_cloud(cloud) do
+      vputs header("Creating keypair for #{name}")
+      create_keypair unless testing
+    end  
+  end
   
 end

data/bin/cloud-configure

@@ -2,21 +2,13 @@
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
+
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-  opts.on('-c [master|slaves|all]', '--class [master|slaves|all]', 'Provision class (default: all)')    { |c| optioner.provision_class c }
-  opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
 end
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-@provision_class = o.provision_class || "all"
-
-include Remote
-
-@clouds = o.cloudname ? {:cloud => cloud(o.cloudname.downcase.to_sym)} : clouds
 
-@clouds.each do |name, cloud|
+o.loaded_clouds.each do |cloud|
   
-  with_cloud(cloud, {:testing => o.testing, :location => @location, :provision_class => @provision_class, :verbose => o.verbose}) do
+  with_cloud(cloud) do
     
     # hide_output do
       # if provision_class == "master" || provision_class == "all"

data/bin/cloud-contract

@@ -6,17 +6,12 @@ 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
-load_pool(o.spec || Binary.get_existing_spec_location)
 
-@testing = o.testing
-
-include Remote
-
-@cloud = extract_cloud_from_options(o).first
-
-with_cloud(@cloud, {:testing => @testing}) do
-  puts header("Contracting cloud #{name}")
-  puts "#{list_of_running_instances.size} running instances (#{minimum_instances} minimum instances)"
-  puts testing ? "Not contracting (test mode)" : "Contracting the cloud if possible"
-  contract_cloud_if_necessary( !testing )
+o.loaded_clouds.each do |cl|
+  with_cloud(cl) do
+    puts header("Contracting cloud #{name}")
+    puts "#{list_of_running_instances.size} running instances (#{minimum_instances} minimum instances)"
+    puts testing ? "Not contracting (test mode)" : "Contracting the cloud if possible"
+    contract_cloud_if_necessary( !testing )
+  end
 end

data/bin/cloud-ensure-provisioning

@@ -8,21 +8,12 @@ o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-n name', '--name name', 'Host name')    { |h| optioner.hostname h }
   opts.on('-l', '--no-shell', 'No shell') {optioner.noshell true}
 end
-
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-include Remote
-
-@clouds = o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds
 @hostname = o.hostname ? o.hostname : `hostname`.chomp
-
 @hostname = "node0" if @hostname == "master" # Quick fix to make sure we have a node running on the master as well
 
-@clouds.each do |name, cloud|
+o.loaded_clouds.each do |cloud|
   
-  with_cloud(cloud, {:testing => o.testing, :hostname => @hostname, :noshell => o.noshell }) do
-    # TODO: Change this to be app specfic
-    # SECURITY RISK
+  with_cloud(cloud, {:hostname => @hostname}) do
     
     boot_file = "#{Messenger.append_dir}/pm_node_rel-0.1"
     command = Messenger.erl_command(hostname, "-boot #{boot_file} #{noshell ? "" : "-detached -heart"}")

data/bin/cloud-expand

@@ -4,19 +4,12 @@ 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 }
+  opts.on('-n name', '--name name', 'Expand the cloud on this name')    { |c| optioner.cloudname c }
 end
-load_pool(o.spec || Binary.get_existing_spec_location)
 
-@testing = o.testing
+o.loaded_clouds.each do |cloud|
 
-include Remote
-
-@clouds = extract_cloud_from_options o
-
-@clouds.each do |cloud|
-
-  with_cloud(cloud, {:testing => @testing, :verbose => o.verbose}) do
+  with_cloud(cloud) do
     vputs header("Expanding cloud #{name}")
     vputs "#{list_of_running_instances.size} running instances of #{maximum_instances} possible instances"
     vputs testing ? "Not expanding (test mode)" : "Expanding the cloud"

data/bin/cloud-handle-load

@@ -2,20 +2,14 @@
 $:.unshift(File.join(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
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-@location = o.location ? o.location : "remote"
-
-include Remote
-
-@clouds = o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds
 
-@clouds.each do |name, cloud|
+o.loaded_clouds.each do |cloud|
 
-  with_cloud(cloud, {:location => @location, :testing => o.testing, :verbose => o.verbose}) do
+  with_cloud(cloud) do
     vputs header("Load handling cloud #{name}")
     if should_expand_cloud?
       vputs "Expanding cloud based on load"

data/bin/cloud-list

@@ -2,23 +2,17 @@
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
+
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-f [remote|local]', '--from [remote|local]', 'Remote or local (default: local)')    { |o| optioner.location o }
   opts.on('-r', '--remote', 'Remote listing')    { optioner.location "remote" }
   opts.on('-l', '--local', 'Local listing')    { optioner.location "local" }
   opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
 end
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-@location = o.location ? o.location : "remote"
-
-include Remote
-
-@clouds = o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds
 
-@clouds.each do |name, cloud|
+o.loaded_clouds.each do |cloud|
   
-  with_cloud(cloud, {:location => @location}) do
+  with_cloud(cloud) do
     puts header("Listing cloud #{name}")
     puts subheader("Active instances")
     puts list_of_running_instances.map{|a| a.to_s}.join("\n")

data/bin/cloud-maintain

@@ -8,17 +8,10 @@ o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-l', '--local', 'Local listing')    { optioner.location "local" }
   opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
 end
-load_pool(o.spec || Binary.get_existing_spec_location)
 
-@location = o.location ? o.location : "remote"
+o.loaded_clouds.each do |cloud|
 
-include Remote
-
-@clouds = o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds
-
-@clouds.each do |name, cloud|
-
-  with_cloud(cloud, {:location => @location, :testing => o.testing, :verbose => o.verbose}) do
+  with_cloud(cloud) do
     vputs header("Maintaining cloud #{name}")
     logger.warn "Maintaining cloud"
     logger.warn rules_values

data/bin/cloud-osxcopy

@@ -2,18 +2,12 @@
 $:.unshift(File.join(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 }
+  opts.on('-n name', '--name name', 'Copy the master ip for this cloud')    { |c| optioner.cloudname c }
 end
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-@location = o.location ? o.location : "remote"
-
-include Remote
-
-@clouds = o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds
 
-@clouds.each do |name, cloud|
+o.loaded_clouds.each do |cloud|
   
   with_cloud(cloud, {:location => @location}) do
     Kernel.system "echo #{master.ip.chomp} | pbcopy"

data/bin/cloud-provision

@@ -2,20 +2,15 @@
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
+
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-  opts.on('-s', '--slave', 'Provision slave (default: false)')    { optioner.provision_slave true }
+  opts.on('-p', '--slave', 'Provision slave (default: false)')    { optioner.provision_slave true }
   opts.on('-i num', '--id num', 'Instance num to provision')    { |i| optioner.instance_num i }
 end
 
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-include Remote
-
-@clouds = extract_cloud_from_options o
-
-@clouds.each do |cloud|
+o.loaded_clouds.each do |cloud|
 
-  with_cloud(cloud, {:verbose => o.verbose, :testing => o.testing, :provision_slave => (o.provision_slave || false), :instance_number => o.instance_num}) do
+  with_cloud(cloud) do
 
     instance_num = instance_number.to_i if instance_number
     

data/bin/cloud-refresh

@@ -6,17 +6,10 @@ 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
-load_pool(o.spec || Binary.get_existing_spec_location)
 
-@provision_class = o.provision_class || "all"
-
-include Remote
-
-@clouds = o.cloudname ? {:cloud => cloud(o.cloudname.downcase.to_sym)} : clouds
-
-@clouds.each do |name, cloud|
+o.loaded_clouds.each do |cloud|
   
-  with_cloud(cloud, {:testing => o.testing}) do
+  with_cloud(cloud) do
     cmd = <<-EOE
 puppetrun --host #{list_of_node_names.join(", --host ")}
     EOE

data/bin/cloud-run

@@ -11,9 +11,8 @@ o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-c command', '--command command', 'Command to run on the instance')    { |c| optioner.command c }
 end
 
-load_pool(o.spec || Binary.get_existing_spec_location)
-
 @cmd = o.command if (o.command)
-@cloud = o.cloudname ? cloud(o.cloudname.downcase.to_sym) : cloud(clouds.keys.first)
 
-instance = @cloud.run_command_on_instance_number( @cmd, o.num.to_i || 0 ) if @cloud
+o.loaded_clouds.each do |cl|
+  @cloud.run_command_on_instance_number( @cmd, o.num.to_i || 0 ) if @cloud
+end

data/bin/cloud-ssh

@@ -2,12 +2,13 @@
 $:.unshift(File.join(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 }
   opts.on('-i num', '--id num', 'Instance num to ssh (default: 0)')    { |i| optioner.num i }
 end
 load_pool(o.spec || Binary.get_existing_spec_location)
 
-@cloud = o.cloudname ? cloud(o.cloudname.downcase.to_sym) : cloud(clouds.keys.first)
+@cloud = o.loaded_clouds.first
 
-instance = @cloud.ssh_into_instance_number( o.num.to_i || 0 ) if @cloud
+@cloud.ssh_into_instance_number( o.num.to_i || 0 ) if @cloud

data/bin/cloud-start

@@ -2,21 +2,15 @@
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
+
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|  
-  opts.on('-c cloudname', '--cloud name', 'Start cloud by this name')    { |c| optioner.cloudname c }
+  opts.on('-n cloudname', '--name name', 'Start cloud by this name')    { |c| optioner.cloudname c }
 end
 
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-@testing = o.testing
-
-@clouds = o.cloudname ? {:cloud => cloud(o.cloudname.downcase.to_sym)} : clouds
-
-@clouds.each do |name, cloud|
-  
-  with_cloud(cloud, {:testing => @testing, :verbose => (o.verbose || false)}) do
-    puts header("Starting cloud")
-    puts "#{list_of_running_instances.size} running instances (#{minimum_instances} - #{maximum_instances})"
+o.loaded_clouds.each do |cloud|
+  with_cloud(cloud) do
+    vputs header("Starting cloud")
+    vputs "#{list_of_running_instances.size} running instances (#{minimum_instances} - #{maximum_instances})"
     if list_of_running_instances.size <= 1
       puts "Starting the master instance"    
       if testing
@@ -28,7 +22,7 @@ load_pool(o.spec || Binary.get_existing_spec_location)
         provisioning_complete
       end
     end
-    puts open(::File.join(File.dirname(__FILE__), "..", "lib", "poolparty", "config", "postlaunchmessage.txt")).read ^ {:master_ip => master.ip.chomp}
+    vputs open(::File.join(File.dirname(__FILE__), "..", "lib", "poolparty", "config", "postlaunchmessage.txt")).read ^ {:master_ip => master.ip.chomp}
     clear_base_directory unless testing
   end
   

data/bin/cloud-terminate

@@ -2,17 +2,14 @@
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
+
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-  opts.on('-c [master|slaves|all]', '--class [master|slaves|all]', 'Provision class (default: all)')    { |c| optioner.provision_class c }
-  opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
+  opts.on('-n name', '--name name', 'Terminate the cloud of this name')    { |c| optioner.cloudname c }
 end
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-@clouds = o.cloudname ? {:cloud => cloud(o.cloudname.downcase.to_sym)} : clouds
 
-@clouds.each do |name, cloud|
+o.loaded_clouds.each do |cloud|
   
-  with_cloud(cloud, {:testing => o.testing, :location => @location, :provision_class => @provision_class}) do
+  with_cloud(cloud) do
     
     list_of_running_instances.each do |inst|
       puts "Shutting down #{inst.instance_id}"