auser-poolparty 1.1.7 → 1.2.0

data/History.txt

@@ -1,3 +1,6 @@
+== 1.1 2009-03-03
+  * Release 1.1 with new stable core
+
 == 1.0.0 2009-1-20
 	* Released 1.0 at CitrusByte
 	* Party

data/README.txt

@@ -13,13 +13,6 @@ pool :cloud do
  end
 end
 
-== FEATURES/PROBLEMS:
-
-* Written in Ruby and Erlang
-* Written from the ground up to be extensible with plugins
-* Easy git-style commands to communicate with your clouds
-* Much much more
-
 == SYNOPSIS:
 
 PoolParty is written with the intention of being as application-agnostic as possible. It installs only the basic 
@@ -28,6 +21,16 @@ required software to glue the cloud together on the instances as listed below.
 PoolParty is easily configuration. In fact, it makes little assumptions about your development environment and allows 
 several options on how to begin configuring the cloud.
 
+== WHAT NEXT:
+* PoolParty::Resources - learn how to use resources in your <tt>clouds.rb</tt>
+
+== FEATURES/PROBLEMS:
+
+* Written in Ruby and Erlang
+* Written from the ground up to be extensible with plugins
+* Easy git-style commands to communicate with your clouds
+* Much much more
+
 == REQUIREMENTS:
 
 Ruby

data/Rakefile

@@ -51,7 +51,6 @@ end
 
 task :release => [:update_timestamp]
 
-
 # Generate documentation
 Rake::RDocTask.new do |rd|
   rd.main = "Readme.txt"

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 1
-:patch: 7
+:minor: 2
+:patch: 0
 :major: 1

data/bin/cloud-osxcopy

@@ -4,7 +4,7 @@ require "poolparty"
 require "poolpartycl"
 
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-  opts.on('-n name', '--name name', 'Copy the master ip for this cloud')    { |c| optioner.cloudname c }
+  opts.on('-n name', '--name name', 'Copy an ip from this cloud to the clipboard')    { |c| optioner.cloudname c }
 end
 
 o.loaded_clouds.each do |cld|

data/bin/cloud-setup-dev

@@ -13,7 +13,7 @@ o.loaded_clouds.each do |cld|
     puts "Your cloud is not running"
   else
     str =<<-EOE
-    Host #{cld.name}-master
+    Host #{cld.name}
       User        #{cld.user}
       Hostname    #{cld.remote_instances_list.first.ip}
       IdentityFile    #{cld.keypair}

data/bin/cloud-spec

@@ -31,7 +31,6 @@ o.loaded_clouds.each do |cloud|
       when nil
         print_with_nice_printer("Starting live specing cloud #{name}")
         puts "TODO:  this isn't implented yet."
-        # hide_output {launch_and_configure_master!}
         print_with_nice_printer("Waiting for cloud to provision")
         
       end

data/bin/cloud-terminate

@@ -5,6 +5,7 @@ require "poolpartycl"
 
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-n name', '--name name', 'Terminate the cloud of this name')    { |c| optioner.cloudname c }
+  opts.on('-y', '--yes', 'Terminate the cloud without prompt')    { optioner.yes true }
 end
 
 o.loaded_clouds.each do |cld|
@@ -14,9 +15,14 @@ Shutting down #{inst.instance_id}
 Are you sure? (Y/N)
     EOM
     
-    if are_you_sure?(msg)
+    if o.yes?
       puts "Shutting down #{inst.instance_id}"
       cld.terminate_instance!(:instance_id => inst.instance_id)
+    else
+      if are_you_sure?(msg)
+        puts "Shutting down #{inst.instance_id}"
+        cld.terminate_instance!(:instance_id => inst.instance_id)
+      end
     end
   end
 end

data/bin/cloud-verify

@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+
+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
+
+o.loaded_clouds.each do |cld|
+
+  begin
+    if cld.verifiers.size > 0
+      cld.passing?
+      cld.vputs "Cloud passed verification"
+    else
+      raise "Your cloud doesn't have any verifiers!"
+      exit 2
+    end
+  rescue Exception => e
+     cld.vputs <<-EOM
+
+      Verification failed: #{e}"
+        Please check your clouds.rb for any errors
+
+      EOM
+  end
+
+end
+

data/examples/basic.rb

@@ -2,20 +2,17 @@
 # Shows global settings for the clouds
 pool :application do
   instances 3..50
-  keypair "auser"
-  testing true
-  
+    
   cloud :basic_app do
+    
     minimum_instances 12
     ami "ami-abc123"
     junk_yard_dogs "pains"
     has_file :name => "/etc/init.d/motd", :content => "Welcome to your PoolParty instance"
   end
   
-  cloud :basic_db do
+  cloud :basic_db do    
     minimum_instances 19
-    keypair "hotstuff_database"
-    maximum_instances 20
     ami "ami-1234bc"
     junk_yard_dogs "are bad"
   end

data/examples/fairchild.rb

@@ -2,30 +2,26 @@
 # Shows global settings for the clouds
 pool :application do
   instances 1..3
-  keypair "auser-work"
   ami 'ami-7cfd1a15'  
   
   cloud :example_one do
-    # has_directory "/var/www"
-    # 
-    # has_file "/etc/motd", 
-    #   :content => "Welcome to LARubyConf"
-    # has_file :name => "/var/www/index.html" do
-    #   content "<h1>Welcome to your new poolparty instance</h1>"
-    #   mode 0644
-    #   owner "www-data"
-    # end
-    # 
-    # has_git_repos "paparazzi" do
-    #   :source => "git://github.com/auser/paparazzi.git"
-    #   :at => "/var/www"
-    # end
-    # 
-    # chef do
-    #   include_recipes "~/.poolparty/chef/cookbooks/*"
-    #   
-    #   recipe "#{File.dirname(__FILE__)}/examples/fairchild_chef.rb"
-    # end
+    
+    has_directory "/var/www"
+    
+    has_file "/etc/motd", 
+      :content => "Welcome to LARubyConf"
+    has_file :name => "/var/www/index.html" do
+      content "<h1>Welcome to your new poolparty instance</h1>"
+      mode 0644
+      owner "www-data"
+    end
+    
+    has_git_repos "paparazzi" do
+      source "git://github.com/auser/paparazzi.git"
+      at "/var/www"
+    end
+    
+    apache
     
   end
 

data/examples/maize.rb

@@ -0,0 +1,37 @@
+# Basic poolparty template
+
+pool :clouds do
+  cloud :app do
+    instances 1..3
+    # keypair "#{ENV['HOME']}/ec2/ec2-keypair.pem" # or the full path to the keypair on the development machine
+    ami 'ami-7cfd1a15'
+    using :vmrun do
+      vmx_hash({
+        "/Users/alerner/Documents/vm/Ubuntu32bitVM.vmwarevm/Ubuntu32bitVM.vmx" => "192.168.248.133"
+      })
+    end
+    
+    # directories
+    has_directory "/var/www"
+
+    # packages
+    has_package(:name => "logwatch")
+    has_package(:name => "imagemagick")
+    has_package(:name => "libmagick9-dev")
+    has_package(:name => "librmagick-ruby")
+    has_package(:name => "ffmpeg")
+    has_package(:name => "monit")
+
+    # gems
+    has_gem_package(:name => "rmagick")
+    has_gem_package(:name => "rubyist-aasm")
+    has_gem_package(:name => "rvideo")
+    has_gem_package(:name => "right_aws")
+    has_gem_package(:name => "ap4r")
+    has_gem_package(:name => "rmagick")
+    
+    # services
+    has_service(:name => "monit")
+  end
+
+end

data/lib/poolparty/base_packages/haproxy.rb

@@ -7,7 +7,7 @@ module PoolParty
       
       def enable
         # has_chef_recipe "apache2"
-        include_chef_recipe "#{::File.dirname(__FILE__)}/../../../vendor/chef/apache2"
+        # include_chef_recipe "#{::File.dirname(__FILE__)}/../../../vendor/chef/apache2"
 
         # Restart sysklogd after we update the haproxy.log
         has_service(:name => "sysklogd")    
@@ -28,11 +28,11 @@ module PoolParty
         end
         
         has_directory "/var/run/haproxy"
-        has_package "apache2"
-        has_service "apache2"
+        # has_package "apache2"
+        # has_service "apache2"
         
         has_package "haproxy" do
-          stops get_service("apache2"), :immediately
+          # stops get_service("apache2"), :immediately
           # starts get_service("apache2")
         end
 
@@ -49,8 +49,8 @@ module PoolParty
         # Service is required
         has_service("haproxy") do
           action [:start, :enable]
-          stops get_service("apache2"), :immediately
-          starts get_service("apache2")
+          # stops get_service("apache2"), :immediately
+          # starts get_service("apache2")
         end
         
       end

data/lib/poolparty/base_packages/heartbeat.rb

@@ -3,53 +3,11 @@ module PoolParty
     plugin :poolparty_base_heartbeat do
       
       def enable        
-        # execute_on_master do
+
         has_package({:name => "heartbeat-2"})
         has_package({:name => "heartbeat-2-dev"})
         
         has_service("heartbeat")
-      
-        # has_service(:name => "heartbeat", :hasstatus => true, :hasrestart => true)
-        # has_directory(:name => "/etc/ha.d")
-        # 
-        # has_remotefile(:name => "/etc/ha.d/ha.cf") do
-        #   mode 444
-        #   notify service(:name => "heartbeat")
-        #   template "ha.cf"
-        # end
-        # 
-        # has_remotefile(:name => "/etc/ha.d/logd.cf") do
-        #   mode 600
-        #   notify service(:name => "heartbeat")
-        #   template File.join(File.dirname(__FILE__), "..", "templates/logd.cf")
-        # end
-        # 
-        # has_exec(:name => "heartbeat-update-cib", :command => "/usr/sbin/cibadmin -R -x /etc/ha.d/cib.xml", :refreshonly => true)
-        #     
-        # has_remotefile(:name => "/etc/ha.d/authkeys") do
-        #   mode 600
-        #   notify service(:name => "heartbeat")
-        #   template File.join(File.dirname(__FILE__), "..", "templates/authkeys")
-        # end
-        #     
-        # has_remotefile(:name => "/etc/ha.d/cib.xml") do
-        #   mode 444
-        #   notify exec(:name => "heartbeat-update-cib")
-        #   template File.join(File.dirname(__FILE__), "..", "templates/cib.xml")
-        # end
-        # 
-        # has_remotefile(:name => "/etc/ha.d/haresources") do
-        #   mode 644
-        #   template File.join(File.dirname(__FILE__), "..", "templates/haresources")
-        # end
-        # # end
-        # 
-        # # variables for the templates
-        # has_variable(:name => "ha_nodenames", :value => "generate('/usr/bin/env', '/usr/bin/server-list-active', '-c', 'name', '-n', '#{cloud.name}')")
-        # has_variable(:name => "ha_node_ips",  :value => "generate('/usr/bin/env', '/usr/bin/server-list-active', '-c', 'ip', '-n', '#{cloud.name}')")
-        # 
-        # has_variable({:name => "ha_timeout",  :value => (self.respond_to?(:timeout) ? timeout : "5s")})
-        # has_variable({:name => "ha_port", :value => (self.respond_to?(:port) ? port : Default.port)})
           
       end
 

data/lib/poolparty/base_packages/poolparty.rb

@@ -2,9 +2,7 @@ module PoolParty
   class Base
     plugin :poolparty_base_packages do
       
-      def enable
-        has_package "git-core"
-        
+      def enable        
         has_cron "/usr/bin/server-manage-election" do
           minute "0,5,10,15,20,25,30,35,40,45,50,55"
           command "/usr/bin/server-manage-election"

data/lib/poolparty/modules/cloud_dsl.rb

@@ -18,9 +18,17 @@ module PoolParty
     end
     
     # Enable a service package
-    def enable(service);dsl_options[service] = :enabled;end
+    def enable(*services)
+      services.each do |service|
+        dsl_options[service] = :enabled
+      end
+    end
     # Disable a service package
-    def disable(service);dsl_options[service] = :disabled;end
+    def disable(*services)
+      services.each do |service|
+        dsl_options[service] = :disabled
+      end
+    end
     
     # Check to see if the package has been enabled
     def enabled?(srv);dsl_options.has_key?(srv) && dsl_options[srv] == :enabled;end

data/lib/poolparty/modules/cloud_resourcer.rb

@@ -54,10 +54,6 @@ module PoolParty
         raise SpecException.new("Don't know how to handle instances cloud input #{arg}")
       end
     end
-    
-    def setup_dev
-      return true if keypair || master.nil?
-    end
         
     # Declare the remoter base
     # Check to make sure the available_bases is available, otherwise raise

data/lib/poolparty/net/init.rb

@@ -1,5 +1,5 @@
 # Load the core net libraries.  These are neccessary for any of the remoter_bases to function.
-%w(remote_instance messenger remote_bases remoter_base).each do |file|
+%w(remote_instance remote_bases remoter_base).each do |file|
   require File.join(::File.dirname(__FILE__),file+'.rb')
 end
 

data/lib/poolparty/net/remote_instance.rb

@@ -20,12 +20,6 @@ module PoolParty
       def on_init
       end
       
-      # Is this remote instance the master?
-      # DEPRECATE
-      def master?
-        name == "master"
-      end
-      
       # The remote instances is only valid if there is an ip and a name
       def valid?
         (ip.nil? || name.nil?) ? false : true
@@ -78,27 +72,6 @@ module PoolParty
         new(hsh).to_s
       end
       
-      #TODO: Diet the next 5 commands
-      def dependency_resolver_command
-        cloud.dependency_resolver_command
-      end
-      
-      #FIXME: deprecate puppet specific commands in this class
-      def puppet_runner_command
-        self.class.send :puppet_runner_command
-      end
-      # Commands for the servers
-      def self.puppet_runner_command
-        ". /etc/profile && puppetrunner"
-      end
-      def self.puppet_master_rerun_command
-        ". /etc/profile && puppetrerun"
-      end
-      def self.puppet_rerun_commad
-        puppet_runner_command
-      end
-      #
-      
       def hosts_file_listing_for(cl)
         string = (cl.name == cloud.name) ? "#{name}.#{my_cloud.name}\t#{name}" : "#{name}.#{my_cloud.name}"
         "#{internal_ip}\t#{string}"

data/lib/poolparty/net/remoter/cloud_control.rb

@@ -11,179 +11,6 @@ module PoolParty
     def are_too_many_instances_running?
       nodes(:status => "running").size > maximum_instances.to_i
     end
-    
-    
-    # TODO: Deprecate all below here
-    # # A convenience method for waiting until there are no more
-    # # pending instances and then running the block
-    # def when_no_pending_instances(&block)
-    #   reset!
-    #   if list_of_pending_instances && list_of_pending_instances.size == 0
-    #     vputs "" # Clear the terminal with a newline
-    #     block.call if block
-    #   else
-    #     vprint "."
-    #     wait "5.seconds"
-    #     when_no_pending_instances(&block)
-    #   end
-    # end
-    # 
-    # # Stub method for the time being to handle expansion of the cloud
-    # def can_expand_cloud?(force=false)
-    #   (are_too_few_instances_running? || are_expansion_rules_valid? ) || force || false
-    # end
-    # def are_expansion_rules_valid?
-    #   valid_rules?(:expand_when)
-    # end
-    # # Stub method for the time being to handle the contraction of the cloud
-    # def can_contract_cloud?(force=false)
-    #   return true if force
-    #   ((are_any_nodes_exceeding_minimum_runtime? and are_too_many_instances_running?) || are_contraction_rules_valid?) || false
-    # end
-    # def are_contraction_rules_valid?
-    #   valid_rules?(:contract_when)
-    # end
-    # # Expand the cloud
-    # # If we can start a new instance and the load requires us to expand
-    # # the cloud, then we should request_launch_new_instances
-    # # Wait for the instance to boot up and when it does come back
-    # # online, then provision it as a slave, this way, it is ready for action from the
-    # # get go
-    # def expand_cloud_if_necessary(force=false)
-    #   if can_start_a_new_instance? && can_expand_cloud?(force)
-    #     vputs "Expanding the cloud based on load"
-    #     @num = 1
-    #     @num.times do |i|
-    #       list_of_pending_instances.size == 0 ? request_launch_one_instance_at_a_time : wait("5.seconds")          
-    #       reset!
-    #       vputs "request_launch_new_instances: #{@num}"
-    #       provision_slaves_from_n(@num)
-    #       after_launched
-    #     end
-    #   end
-    # end
-    # # Contract the cloud
-    # # If we can shutdown an instnace and the load allows us to contract
-    # # the cloud, then we should request_termination_of_non_master_instance
-    # def contract_cloud_if_necessary(force=false)
-    #   if can_shutdown_an_instance? && can_contract_cloud?(force)
-    #     vputs "Shrinking the cloud by 1"
-    #     before_shutdown
-    #     request_termination_of_non_master_instance
-    #   end
-    # end
-    # 
-    # # List calculation methods
-    # # 
-    # # Are the minimum number of instances running?
-    # def minimum_number_of_instances_are_running?
-    #   nodes(:status => "running").size >= minimum_instances.to_i
-    # end
-    # # Are the minimum number of instances NOT running?
-    # def minimum_number_of_instances_are_not_running?
-    #   !(minimum_number_of_instances_are_running?)
-    # end
-    # # Can we shutdown an instance?
-    # def can_shutdown_an_instance?
-    #   nodes(:status => "running").size > minimum_instances.to_i
-    # end
-
-    # 
-    # ########
-    # # TODO: deprecate methods below here (only if they are deprecate-able)
-    # ########
-    # 
-    # # Request to launch a number of instances
-    # def request_launch_new_instances(num=1)
-    #   out = []
-    #   num.times {out << launch_new_instance!(options) }
-    #   out
-    # end
-    # def request_launch_master_instance
-    #   @inst = launch_new_instance!
-    #   wait "5.seconds"
-    #   when_no_pending_instances do
-    #     vputs "Master has launched"
-    #     reset!
-    #     after_launch_master(@inst)
-    #   end
-    # end
-    # 
-    # 
-    # def after_launch_master(inst=nil)
-    #   vputs "After launch master in remoter"
-    # end
-    # # Let's terminate an instance that is not the master instance
-    # def request_termination_of_non_master_instance
-    #   inst = nonmaster_nonterminated_instances.last
-    #   terminate_instance!(inst.instance_id) if inst
-    # end
-    # # Can we start a new instance?
-    # def can_start_a_new_instance?
-    #   maximum_number_of_instances_are_not_running? && list_of_pending_instances.size == 0
-    # end
-    # # Are the maximum number of instances not running?
-    # def maximum_number_of_instances_are_not_running?
-    #   nodes(:status => "running").size < maximum_instances.to_i
-    # end
-    # # Are the maximum number of instances running?
-    # def maximum_number_of_instances_are_running?
-    #   nodes(:status => "running").size >= maximum_instances.to_i
-    # end
-    # # Launch new instance while waiting for the number of pending instances
-    # #  to be zero before actually launching. This ensures that we only
-    # #  launch one instance at a time
-    # def request_launch_one_instance_at_a_time
-    #   when_no_pending_instances { launch_new_instance! }
-    # end
-    # 
-    # # A convenience method for waiting until all the instances have an ip
-    # # assigned to them. This is useful when shifting the ip addresses
-    # # around on the instances
-    # def when_all_assigned_ips(&block)
-    #   reset!
-    #   if list_of_nonterminated_instances.select {|a| a.ip == 'not.assigned' }.empty?          
-    #     block.call if block
-    #   else
-    #     vprint "."
-    #     wait "5.seconds"
-    #     when_all_assigned_ips(&block)
-    #   end
-    # end
-    # def running_instance_ips
-    #   remote_instances_list.select {|inst| 
-    #     inst.running? and inst.ip!='not.assigned'
-    #   }.collect{|n| n.ip}
-    # end
-    # 
-    # # This will launch the minimum_instances if the minimum number of instances are not running
-    # # If the minimum number of instances are not running and if we can start a new instance
-    # def launch_minimum_number_of_instances        
-    #   if can_start_a_new_instance? && !minimum_number_of_instances_are_running?         
-    #     list_of_pending_instances.size == 0 ? request_launch_one_instance_at_a_time : wait("5.seconds")
-    #     reset!
-    #     launch_minimum_number_of_instances
-    #     provision_slaves_from_n(minimum_instances.to_i)
-    #     after_launched
-    #   end
-    # end
-    # 
-    # def provision_slaves_from_n(num=1)
-    #   vputs "In provision_slaves_from_n: #{num}"
-    #   reset!
-    #   when_no_pending_instances do
-    #     vputs "Waiting for 10 seconds"
-    #     wait "10.seconds" # Give some time for ssh to startup          
-    #     @num_instances = nodes(:status => "running").size
-    #     vputs "(@num_instances - (num))..(@num_instances): #{(@num_instances - (num))..(@num_instances)}"
-    #     last_instances = nonmaster_nonterminated_instances[(@num_instances - (num))..(@num_instances)]
-    #     last_instances.each do |inst|
-    #       vputs "Provision slave: #{inst}"
-    #       verbose ? provisioner_for(inst).install(testing) : hide_output { provisioner_for(inst).install(testing)}
-    #     end
-    #     # PoolParty::Provisioner.reconfigure_master(self)
-    #   end
-    # end
 
     def list_of_nodes_exceeding_minimum_runtime
       nodes(:status => "running").reject{|i| i.elapsed_runtime < minimum_runtime}
@@ -192,10 +19,6 @@ module PoolParty
     def are_any_nodes_exceeding_minimum_runtime?
       !list_of_nodes_exceeding_minimum_runtime.blank?
     end
-    # Is there a node that is running with the name master
-    def is_master_running?
-      !nodes(:status => "running").select {|a| a.name == "master"}.first.nil?
-    end    
     
   end
 end