auser-poolparty 1.2.10 → 1.2.11

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 2
-:patch: 10
+:patch: 11
 :major: 1

data/bin/cloud

@@ -31,7 +31,7 @@ EOS
     @loaded_clouds = command[:cloud_name] ? [clouds[command[:cloud_name].to_sym]] : clouds.map {|k,c| c }
     @loaded_clouds.each do |cld|
       cld.verbose command[:verbose]
-      cld.debug command[:debug]
+      cld.debugging = command[:debug]
     end
   end
   

data/bin/cloud-list

@@ -14,6 +14,7 @@ Usage: #{$0} #{all_options_string}
 EOS
 
   opt :instance_id, "Describe a specific instance", :type => String, :default => nil
+  opt :short, "show a short description rather than a long one", :default => false
 
   short_desc "show a list of the current instances on the clouds"
 
@@ -23,13 +24,24 @@ EOS
         require 'pp'
         pp result = cld.nodes(:instance_id=>command[:instance_id])
       else
-        puts "Listing cloud #{cld.name}"
-        puts "Active instances"
-        puts cld.nodes(:status => "running").map{|a| "#{a[:instance_id] || a[:id]}\t#{a[:ip] ||a[:public_ip] }" }.join("\n")
-        
-        if cld.nodes(:status => "pending").size > 0
-          puts "Pending instances"
-          puts cld.nodes(:status => "pending").map{|a| "#{a[:instance_id] || a[:id]}\t#{a[:ip] ||a[:public_ip] }" }.join("\n")
+        if command[:short]
+          %w{running pending}.each do |status|
+            nodes = cld.nodes(:status => status)
+            if nodes.size > 0
+              puts nodes.map{|a| 
+                "%-15s [%s]: #{a[:instance_id] || a[:id]}\t#{a[:ip] ||a[:public_ip] }" % [cld.name, status] 
+              }.join("\n")
+            end
+          end
+        else
+          puts "Listing cloud #{cld.name}"
+          puts "Active instances"
+          puts cld.nodes(:status => "running").map{|a| "#{a[:instance_id] || a[:id]}\t#{a[:ip] ||a[:public_ip] }" }.join("\n")
+          
+          if cld.nodes(:status => "pending").size > 0
+            puts "Pending instances"
+            puts cld.nodes(:status => "pending").map{|a| "#{a[:instance_id] || a[:id]}\t#{a[:ip] ||a[:public_ip] }" }.join("\n")
+          end
         end
       end
     end

data/bin/cloud-provision

@@ -21,6 +21,9 @@ EOS
       if cld.nodes.empty?
         puts "No nodes to provision"
       else
+        # Call before_provision callback on cloud
+        cld.call_before_provision_callbacks
+        
         if command[:inst_num]
           vputs "\nConfiguring: #{nodes[o.inst_num]}\n--------------------"
           address = cld.nodes[ command[:inst_num] ]

data/bin/cloud-run

@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby
+$:.unshift(File.dirname(__FILE__) + "/../lib")
+require "poolparty"
+# require "poolpartycl"
+require 'git-style-binary/command'
+
+GitStyleBinary.command do  
+  version "PoolParty #{$0} command"  
+  banner <<-EOS
+Usage: #{$0} #{all_options_string} cmd
+
+  run a cmd in the cloud
+EOS
+
+  short_desc "run a cmd in the cloud"
+  opt :inst_num, "The number of the instance to ssh to, starts at 0.", :type => :int
+  
+  run do |command|    
+    @loaded_clouds.each do |cloud|
+      @cloud = cloud
+      nodes = @cloud.nodes(:status => "running")
+      
+      if !nodes.empty?
+        nodes.each_with_index do |node, i|
+          next unless i == command[:inst_num].to_i if command[:inst_num]
+          ip = nodes[i].ip || nodes[i].public_ip
+          cmd = ARGV.join(" ")
+          puts "%s %s: %s" % [cloud.cloud_name, ip, cmd]
+          @cloud.ssh_into(ip, :cmd => cmd) if @cloud
+        end
+      else
+        puts "No running instances can be found"
+      end
+    end
+    
+  end    
+end

data/bin/server-list-active

@@ -11,7 +11,7 @@ raise "ERROR: no json_file given" if !json_file
 
 cld = Cloud.load_from_json(::File.read(json_file))
 conditions= {:status=>'running', :keypair=>cld.keypair_name}
-inst_array = cld.remote_base.describe_instances.select_with_hash(conditions)
+inst_array = cld.nodes(conditions)
 puts inst_array.collect{|n| n[list_type] || n[list_type.to_sym]}.join("\t")
 
 

data/config/jeweler.rb

@@ -36,14 +36,14 @@ end
         "--main", "README"
         ]
     
-    s.add_dependency 'activesupport'
+    # s.add_dependency 'activesupport'
     s.add_dependency 'logging'
     # s.add_dependency 'auser-dslify'
     # s.add_dependency 'auser-parenting'
     # s.add_dependency 'auser-suitcase'
     # s.add_dependency 'ruby2ruby'  #TODO: remove this after verifying removing doesnt break anything
     s.add_dependency 'grempe-amazon-ec2'
-    s.add_dependency 'rubigen', ">=1.5.2"
+    # s.add_dependency 'rubigen', ">=1.5.2"
     # Certainly there should be more here
     
   end

data/examples/basic.rb

@@ -3,14 +3,15 @@
 pool :application do
   instances 1..5
   
-  cloud :basic_app do
+  cloud :frontend do
     minimum_instances 3
-    keypair 'front'
+    keypair 'application_frontend'
     image_id "ami-abc123"
     has_file :name => "/etc/motd", :content => "Welcome to your PoolParty instance"
   end
   
-  cloud :basic_db do
+  cloud :database do
+    keypair 'application_database'
     using :vmrun do
       vmx_hash "/path/to/vmx_file" => "192.168.248.122"
     end

data/examples/fairchild.rb

@@ -9,8 +9,8 @@ pool :party do
   image_id 'ami-7cfd1a15'
   debugging true
   
-  access_key "XXXXXX"
-  secret_access_key "XXXXXXX"
+  # access_key "XXXXXX"
+  # secret_access_key "XXXXXXX"
   
   cloud :app do
     keypair 'app'

data/examples/metavirt_cloud.rb

@@ -4,18 +4,28 @@ require "poolparty"
 
 pool :multiverse do
   
-  cloud :vv do
-    instances 2
+  cloud :front do
+    instances 1
+    keypair 'multiverse_front'
     has_file "/etc/motd", :content => "Welcome to your poolparty instance!"
     using :metavirt do
-      server_config({:host=>"192.168.248.1", :port=>3000})
+      server_config({:host=>"192.168.1.97", :port=>3000})
       authorized_keys 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCTppECfx7Tb0zoviRfqFaePyAek6+ZktKkHiTHu/jkhG1s4q1oHEe89no21xLxuReyJrDlNe8rLxxZzoYCaAWRdhcqMR3BNqb2w2jpF4pH+bFj0557KrwWP6HSNpRRkyYhxLqZbuH/2t3TzkPevZbcfSYa09jIzqnmTruh9l1s+n5E3cNr/RDdDn7tv3Ok7mKN7GEjkK7F83Pt9xviHevg22xqzm99nS+hg6Kl/fQUTO6pOmC5x+9V47RJz1+9WdhGJ7M83zijX9rMnAwrR5LFoL6aZyyU0G71SpoIL5e8XD/jt1WNKFJOfG8YMLb3i03UABm/Q5Q30+R7UoRxSWRX'
-      using :vmrun do
-        # vmx_files Dir[::File.expand_path("~/Documents/Virtual Machines.localized/metavirts/*/*.vmx")]
-        vmx_files [
-          "/Users/alerner/Documents/vm/Ubuntu32bitVM.vmwarevm/Ubuntu32bitVM.vmx"
-          ]
+
+      # using :vmrun do
+      #   # vmx_files Dir[::File.expand_path("~/Documents/Virtual Machines.localized/metavirts/*/*.vmx")]
+      #   vmx_files [
+      #     "/Users/alerner/Documents/vm/Ubuntu32bitVM.vmwarevm/Ubuntu32bitVM.vmx"
+      #     ]
+      # end
+      
+      using :libvirt do
+        image_id 'mvi_ef77fdf0'
+        # memory 256000
+        # cpus 1
+        # network 'vnet0'
       end
+      
     end
   end
   

data/examples/simple.rb

@@ -2,11 +2,12 @@
 
 pool :poolparty do
   
-  instances 2..5
+  instances 1
     
   cloud :app do
-    keypair "auser"
-    ami "ami-4bb05422"
+    keypair "cloudteam_test"
+    
+    has_file "/etc/motd", :content => "Simple"
   end
   
 end

data/examples/vmrun_cloud.rb

@@ -6,13 +6,10 @@ pool :multiverse do
   
   cloud :vv do
     keypair "front"
-    instances 2
+    instances 1
     has_file "/etc/motd", :content => "Welcome to your poolparty instance!"
     using :vmrun do
-      vmx_files [
-        "/Users/mfairchild/Documents/Virtual\ Machines.localized/Ubuntu-jaunty.vmwarevm/Ubuntu-jaunty.vmx",
-        "/Users/mfairchild/Documents/Virtual\ Machines.localized/metavirts/Ubuntu32bitVM copy.vmwarevm/Ubuntu32bitVM.vmx"
-        ]
+      vmx_hash "/Users/stimble/Documents/Virtual Machines.localized/Jaunty.vmwarevm/Jaunty.vmx" => '172.16.68.143'
     end
   end
   

data/lib/poolparty.rb

@@ -75,7 +75,7 @@ $_poolparty_load_directories = [
   "dependency_resolver",
   "aska.rb",
   "config",
-  "monitors/monitor_rack.rb",
+  "monitors/monitor_rack.rb", 
   "capistrano.rb",
   'provisioners/provisioner_base.rb',
   'provisioners/capistrano/capistrano.rb',

data/lib/poolparty/core/object.rb

@@ -94,15 +94,17 @@ class Object
     o.respond_to?(:verbose) ? o.verbose : (debugging? || $TESTING ||= false)
   end
   def debugging?(o=self)
-    o.respond_to?(:debug) ? o.debug : ($DEBUGGING ||= false)
+    debugging
   end
-  def debugging(bool=nil)
-    bool.nil? ? $DEBUGGING : $DEBUGGING = bool
+  def debugging
+    $DEBUGGING ||= false
+  end
+  def debugging=(bool)
+    $DEBUGGING = bool
   end
   def testing(bool=$TESTING)
     bool.nil? ? $TESTING : $TESTING = bool
   end
-  alias :debug :debugging
   def unix_hide_string
     "2>&1 > /dev/null"
   end

data/lib/poolparty/core/string.rb

@@ -29,8 +29,9 @@ class String
     self.strip.split(/\n/).join(" && ")
   end
   def top_level_class
-    self.split("::")[-1].underscore.downcase rescue self.class.to_s
+    self.split("::")[-1].snake_case rescue self.class.to_s
   end
+
   def sanitize
     self.gsub(/[ \.\/\-]*/, '')
   end

data/lib/poolparty/helpers/optioner.rb

@@ -94,7 +94,7 @@ module PoolParty
         @opts.separator "Options:"
         
         @opts.on('-v', '--verbose', 'Be verbose') { self.verbose true }  
-        @opts.on('-d', "--debug", "Debug setting") { self.debugging true }
+        @opts.on('-d', "--debug", "Debug setting") { self.debugging = true }
         @opts.on('-s [file]', '--spec-file [file]', 'Set the spec file') { |file| self.spec file.chomp }
         @opts.on('-t', '--test', 'Testing mode') { self.testing true }
         

data/lib/poolparty/modules/callbacks.rb

@@ -11,6 +11,8 @@ module PoolParty
         [
           :before_bootstrap,
           :after_bootstrap,
+          :before_provision,
+          :after_provision,
           :before_configure,
           :after_configure,
           :after_create,

data/lib/poolparty/modules/cloud_resourcer.rb

@@ -61,11 +61,10 @@ module PoolParty
     # instance of the remote base
     def using(t, o={}, &block)
       return self.send(t) if self.respond_to?(t)
-      if ::PoolParty::Remote::RemoterBase.available_bases.include?(t.to_sym)
-        klass_string = "#{t}".classify
-        remote_base_klass = "::PoolParty::Remote::#{klass_string}".constantize      
+      klass_string = "::PoolParty::Remote::#{t.to_s.camelcase}"
+      remote_base_klass = klass_string.constantize
+      if ::PoolParty::Remote.available.include?(remote_base_klass)
         set_default_options(remote_base_klass.default_options)
-
         @remote_base = remote_base_klass.send(:new, o.merge(:cloud=>self), &block)
         self.remoter_base t.to_sym
         instance_eval "def #{t};@remote_base;end"
@@ -78,7 +77,7 @@ module PoolParty
         raise "Unknown remote base: #{t}"
       end
     end
-
+    
     def dependency_resolver(name=nil)
       if !name.nil?
         ext = name=~/Resolver$/  ? nil : 'Resolver'

data/lib/poolparty/modules/daemonizable.rb

@@ -1,6 +1,5 @@
-# TODO: Diet
-# module PoolParty
-#       
+# # TODO: Diet
+# module PoolParty      
 #   module Daemonizeable
 #     
 #     attr_accessor :pid_file
@@ -14,7 +13,7 @@
 #     end
 #     
 #     def pid_file
-#       @pid_file ||= PoolParty::Default.agent_pid_file
+#       @pid_file ||= "/tmp/poolparty_monitor.pid"
 #     end
 #     
 #     # Returns +true+ the process identied by +pid+ is running.
@@ -135,7 +134,7 @@
 #         end
 #       end
 #   end
-#   class Daemonize
+#   class Daemon
 #     include Daemonizeable
 #   end
 # end

data/lib/poolparty/modules/definable_resource.rb

@@ -16,6 +16,7 @@ module PoolParty
     # 
     # For example usage, see lib/poolparty/plugins/line.rb
     def define_resource(name, &block)
+      $stderr.puts "define_resource (#{name}) is depricated (#{caller[0]})"
       name.to_s.new_resource_class &block
     end
     

data/lib/poolparty/modules/pinger.rb

@@ -1,3 +1,4 @@
+require "timeout"
 module PoolParty
   module Pinger
     module ClassMethods
@@ -5,9 +6,12 @@ module PoolParty
       # for response. 
       def ping_port(host, port=22, retry_times=400)
         connected = false
+        dputs "pinging #{host}:#{port} for #{retry_times}"
         retry_times.times do |i|
           begin
-            break if connected = TCPSocket.new(host, port).is_a?(TCPSocket)
+            timeout 5 do
+              break if connected = TCPSocket.new(host, port).is_a?(TCPSocket)
+            end            
           rescue Exception => e
             sleep(2)
           end

data/lib/poolparty/monitors/monitor_daemon.rb

@@ -0,0 +1,159 @@
+require "open-uri"
+
+module PoolParty
+  class MonitorDaemon
+    
+    attr_reader :should_daemonize, :pid_file, :log_file_path, :sleep_time
+    
+    def self.run(o={})
+      new(o).run
+    end
+    
+    def initialize(o={})
+      @should_daemonize = o.delete(:daemonize)
+      @pid_file = o.delete(:daemonize) || "/tmp/poolparty_monitor.pid"
+      temp_log_file_path = o.delete(:log_file_path) || "poolparty_monitor.log"
+      @log_file_path = temp_log_file_path
+      
+      unless ::File.file?(temp_log_file_path)
+        ::FileUtils.mkdir_p ::File.dirname(temp_log_file_path) unless ::File.directory?(::File.dirname(temp_log_file_path))
+        ::File.open(temp_log_file_path, 'a+')
+        temp_log_file_path
+      end
+      @sleep_time = o.delete(:sleep_time) || 5
+    end
+    
+    def pass_the_baton
+      %w(Memory neighborhood elections).each do |monitor|
+        out = open("http://localhost:8642/#{monitor}").read
+        log "#{monitor} / #{out.inspect}"        
+      end
+      sleep sleep_time
+    end
+    
+    def run      
+      if should_daemonize
+        @should_daemonize = false
+        daemonize
+      else
+        log "Starting MonitorDaemon"
+        loop {pass_the_baton}        
+      end
+    end
+    
+    def daemonize(o={})
+      raise unless pid_file
+      
+      pwd = Dir.pwd # Current directory is changed during daemonization, so store it
+      
+      remove_stale_pid_file
+      pid = fork do
+        Signal.trap('HUP') do
+          restart
+        end
+        Signal.trap('INT') do
+          stop!
+        end
+        Signal.trap("CHLD") do 
+          Process.waitpid(pid, Process::WNOHANG)
+        end
+        File.open("/dev/null", "r+") do |devnull|
+          $stdout.reopen(devnull)
+          $stderr.reopen(devnull)
+          $stdin.reopen(devnull) unless @use_stdin
+        end
+        run
+      end
+      
+      Dir.chdir(pwd)
+      
+      write_pid_file(pid)
+
+      Process.detach(pid)
+    end
+    
+    def log(msg)
+      log_file.flush
+      log_file << "[INFO] - #{Time.now} -- #{msg}\n"
+    end
+    
+    private
+    
+    def log_file
+      if @logfile
+        @logfile
+      else
+        begin
+          ::FileUtils.mkdir_p ::File.dirname(log_file_path) unless ::File.directory?(::File.dirname(log_file_path))
+          @logfile ||= ::File.open(log_file_path, 'a+')
+        rescue Exception => e
+          puts "ERROR: #{e.inspect}"
+          @logfile = $stdout
+        end
+        
+      end
+    end
+    
+    def pid
+      @pid ||= File.file?(pid_file) ? open(pid_file).read.to_i : nil
+    end
+    
+    def stop!
+      log "Stopping daemon"
+      log_file.close
+      send_signal("INT")
+      remove_stale_pid_file
+      exit 0
+    end
+    
+    def restart
+      log "TODO: implement restart for HUP signal on #{__FILE__}"
+    end
+    
+    def running?
+      return false unless pid
+      Process.getpgid(pid) != -1
+    rescue Errno::ESRCH
+      false
+    end
+    
+    def send_signal(signal)
+      if File.exist?(pid_file) && pid = open(pid_file).read
+        pid = pid.to_i
+        print "Sending #{signal} signal to process #{pid} ... "
+        Process.kill(signal, pid)
+        puts
+        pid
+      else
+        puts "Can't stop process, no PID found in #{pid_file}"
+        nil
+      end
+    rescue Errno::ESRCH # No such process
+      puts "process not found!"
+      nil
+    end
+    
+    protected
+    def remove_pid_file
+      File.delete(pid_file) if pid_file && File.exists?(pid_file)
+    end
+    
+    def write_pid_file(pid)
+      FileUtils.mkdir_p File.dirname(pid_file)
+      open(pid_file,"w") { |f| f.write(pid) }
+      File.chmod(0644, pid_file)
+    end
+    
+    def remove_stale_pid_file
+      if File.exist?(@pid_file)
+        if pid && running?
+          puts "Pid file exists" and raise
+        else
+          remove_pid_file
+        end
+      end
+    end
+
+    
+  end
+end