auser-poolparty 0.2.2 → 0.2.3

data/config/requirements.rb

@@ -0,0 +1,15 @@
+require 'fileutils'
+include FileUtils
+
+require 'rubygems'
+%w[rake hoe newgem rubigen].each do |req_gem|
+  begin
+    require req_gem
+  rescue LoadError
+    puts "This Rakefile requires the '#{req_gem}' RubyGem."
+    puts "Installation: gem install #{req_gem} -y"
+    exit
+  end
+end
+
+$:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))

data/lib/poolparty.rb

@@ -5,6 +5,7 @@ require 'active_support'
 require 'open4'
 require "ftools"
 require "logging"
+require "ruby2ruby"
 
 # Use active supports auto load mechanism
 ActiveSupport::Dependencies.load_paths << File.dirname(__FILE__)

data/lib/poolparty/base_packages/haproxy.rb

@@ -3,39 +3,40 @@ module PoolParty
     plugin :haproxy do
       
       def enable
-        package({:name => "haproxy"})
-        
-        # Startup haproxy and enable it
-        has_line_in_file("ENABLED=1", "/etc/default/haproxy")
-        has_line_in_file("SYSLOGD=\"-r\"", "/etc/default/syslogd")
-        has_line_in_file("local0.* /var/log/haproxy.log", "/etc/syslog.conf", {:notify => 'Service["sysklogd"]'})
-        
-        # Restart sysklogd after we update the haproxy.log
-        has_service(:name => "sysklogd") do
-          ensures "running"
+        execute_if("$hostname", "master") do
+          package({:name => "haproxy"})
+
+          # Startup haproxy and enable it
+          has_line_in_file("ENABLED=1", "/etc/default/haproxy")
+          has_line_in_file("SYSLOGD=\"-r\"", "/etc/default/syslogd")
+          has_line_in_file("local0.* /var/log/haproxy.log", "/etc/syslog.conf", {:notify => 'Service["sysklogd"]'})
+
+          # Restart sysklogd after we update the haproxy.log
+          has_service(:name => "sysklogd") do
+            ensures "running"
+          end
+
+          # Service is required
+          has_service(:name => "haproxy")
+
+          # Tempalte variables
+          variable(:name => "name", :value => "#{@parent.name}")
+          variable(:name => "nodenames", :value => list_of_node_names)
+          variable(:name => "node_ips",  :value => list_of_node_ips)
+          variable(:name => "ports", :value => ([(self.respond_to?(:port) ? port : Base.port)].flatten))        
+          variable(:name => "forwarding_port", :value => (respond_to?(:forwarding_port) ? forwarding_port : Base.forwarding_port))
+          variable(:name => "proxy_mode", :value => (respond_to?(:proxy_mode) ? proxy_mode : Base.proxy_mode))
+
+          # These can also be passed in via hash
+          has_remotefile(:name => "/etc/haproxy.cfg") do
+            mode 644
+            # onlyif '$hostname == "master"'
+            requires 'Package["haproxy"]'
+            notify 'Service["haproxy"]'
+            template File.join(File.dirname(__FILE__), "..", "templates/haproxy.conf")
+          end
         end
-        
-        # Service is required
-        has_service(:name => "#{name}")
-        
-        # Tempalte variables
-        variable(:name => "name", :value => "#{name}")
-        variable(:name => "nodenames", :value => list_of_node_names)
-        variable(:name => "node_ips",  :value => list_of_node_ips)
-        variable(:name => "ports", :value => ([port].flatten || [Base.port].flatten))        
-        variable(:name => "forwarding_port", :value => (forwarding_port || Base.forwarding_port))
-        variable(:name => "proxy_mode", :value => (proxy_mode || Base.proxy_mode))
-        
-        # These can also be passed in via hash
-        has_remotefile(:name => "/etc/haproxy.cfg") do
-          mode 644
-          requires 'Package["haproxy"]'
-          notify 'Service["haproxy"]'
-          template File.join(File.dirname(__FILE__), "..", "templates/haproxy.conf")
-        end
-        
       end
-      
     end  
   end
 end

data/lib/poolparty/base_packages/heartbeat.rb

@@ -2,7 +2,7 @@ module PoolParty
   class Base
     plugin :heartbeat do
       
-      def enable
+      def enable        
         has_package(:name => "heartbeat-2", :ensure => "installed")
         has_service(:name => "heartbeat", :hasstatus => true) do
           ensures "running"
@@ -13,7 +13,7 @@ module PoolParty
         # variables for the templates
         has_variable({:name => "nodenames", :value => list_of_node_names})
         has_variable({:name => "node_ips",  :value => list_of_node_ips})
-        has_variable({:name => "port", :value => (port || Base.port)})
+        has_variable({:name => "port", :value => (self.respond_to?(:port) ? port : Base.port)})
         
         # These can also be passed in via hash
         has_remotefile(:name => "/etc/ha.d/ha.cf") do

data/lib/poolparty/base_packages/poolparty.rb

@@ -2,13 +2,19 @@ module PoolParty
   class Base
     plugin :poolparty do
       
-      def enable
+      def enable        
         has_package(:name => "erlang")
-        has_gem_package(:name => "auser-poolparty", :source => "http://gems.github.com")
+        # These should be installed automagically by poolparty, but just in case
+        has_gempackage(:name => "open4")
+        has_gempackage(:name => "activesupport")
+        has_gempackage(:name => "logging")
+        
+        has_gempackage(:name => "grempe-amazon-ec2", :source => "http://gems.github.com")
+        has_gempackage(:name => "auser-poolparty", :source => "http://gems.github.com")
                 
         # Build hostsfile
         # TODO: COME BACK AND CLEAN THIS UP
-        (self.respond_to?(:remote_instances_list) ? self : parent).remote_instances_list.each do |ri|
+        (self.respond_to?(:list_of_running_instances) ? self : parent).list_of_running_instances.each do |ri|
           has_host({:name => "#{ri.name}", :ip => ri.ip })
         end
       end

data/lib/poolparty/base_packages/ruby.rb

@@ -8,6 +8,16 @@ module PoolParty
         has_package(:name => "ruby1.8-dev")
         has_package(:name => "ruby1.8")
         has_package(:name => "rubygems")
+        
+        # exec(:name => "update-rubygems") do
+        #   command "gem update --system"
+        #   ifnot "gem -v | grep 1."
+        #   notify "Exec[fix-updated-rubygems]"
+        # end
+        # exec(:name => "fix-updated-rubygems") do
+        #   command "awk \'{print} NR == 9 {print \"require \"rubygems/gem_runner\"\"}\' /usr/bin/gem"
+        #   ifnot "awk \'/gem_runner/\' /usr/bin/gem"
+        # end
       end
       
       def enable_ri

data/lib/poolparty/core/proc.rb

@@ -1,2 +1,7 @@
+require 'ruby2ruby' 
+
 class Proc
+  def to_ruby(opts={})
+    Ruby2Ruby.new.process(self.to_sexp).gsub(/proc \{/, "do \n#{opts.map {|k,v| "#{k} \"#{v}\""}.join("\n")}\n").sub(/\}/, "\nend")
+  end
 end

data/lib/poolparty/core/string.rb

@@ -39,7 +39,7 @@ class String
   # although, it doesn't really matter as ruby will just reopen the class
   def class_constant(superclass=nil, opts={}, &block)
     symc = ((opts && opts[:preserve]) ? ("#{self.classify}Classs") : "PoolParty#{self.classify}Classs").classify
-        
+    
     kla=<<-EOE
       class #{symc} #{"< #{superclass}" if superclass}
       end

data/lib/poolparty/helpers/binary.rb

@@ -14,11 +14,12 @@ module PoolParty
         "#{::File.dirname(__FILE__)}/../../../bin"
       end
       def get_existing_spec_location
-        [                
-            "pool.spec", 
-            "#{Base.remote_storage_directory}/pool.spec", 
-            "#{Base.storage_directory}/pool.spec",
-            ENV["POOL_SPEC"]
+        [                            
+            "#{Base.base_config_directory}/#{Base.default_specfile_name}",
+            "#{Base.remote_storage_path}/#{Base.default_specfile_name}", 
+            ENV["POOL_SPEC"],
+            "#{Base.default_specfile_name}",
+            "#{Base.storage_directory}/#{Base.default_specfile_name}",            
         ].reject {|a| a.nil?}.reject do |f|
           f unless ::File.file?(f)
         end.first

data/lib/poolparty/helpers/display.rb

@@ -2,9 +2,18 @@ module PoolParty
   module Display
     
     def pool_describe(options={})
-      pools.each do |k,v|
-        print v.pretty_print
+      if pools.size > 0
+        pools.each do |k,v|
+          print v.pretty_print
+        end
+      else
+        prev = "\t"
+        clouds.each do |name, cl|
+          puts cl.pretty_name(prev*2, cl)
+          puts cl.pretty_options(prev*2, cl) #cl.pretty_print("#{prev}\t")
+        end
       end
+
       puts ""
       pools.size
     end

data/lib/poolparty/helpers/optioner.rb

@@ -6,9 +6,8 @@ require 'date'
 module PoolParty
   class Optioner
     include Configurable
-    
-    attr_reader :options
-    
+    include MethodMissingSugar
+        
     def initialize(args=[], opts={}, &block)
       @arguments = args
       @parse_options = opts[:parse_options] ? opts[:parse_options] : true
@@ -18,6 +17,10 @@ module PoolParty
       self
     end
     
+    def parent
+      self
+    end
+    
     def set_default_options
       @options = {}
       @options[:verbose] = false

data/lib/poolparty/helpers/provisioner_base.rb

@@ -46,7 +46,7 @@ module PoolParty
         @cloud = cloud
         
         options(cloud.options) if cloud && cloud.respond_to?(:options)
-        set_vars_from_options(instance.options) unless instance.options.empty?                
+        set_vars_from_options(instance.options) unless instance.nil? || instance.options.empty?
         options(instance.options) if instance.respond_to?(:options)
         
         @os = os.to_s.downcase.to_sym
@@ -61,6 +61,7 @@ module PoolParty
       end
       def write_install_file
         error unless valid?
+        ::FileUtils.mkdir_p Base.storage_directory unless ::File.exists?(Base.storage_directory)
         provisioner_file = ::File.join(Base.storage_directory, "install_#{name}.sh")
         ::File.open(provisioner_file, "w+") {|f| f << install }
       end
@@ -134,8 +135,7 @@ module PoolParty
       # These are run on all the provisioners, master or slave
       def default_install_tasks
         [
-          "export AWS_ACCESS_KEY_ID=#{@cloud.access_key}",
-          "export AWS_SECRET_ACCESS_ID=#{@cloud.secret_access_key}"
+          
         ] << install_tasks
       end
       # Tasks with default configuration tasks
@@ -165,8 +165,8 @@ module PoolParty
       end
       
       # Get the packages associated with each os
-      def get_puppet_packages_for(os)
-        case os
+      def puppet_packages
+        case @os
         when :fedora
           "puppet-server puppet factor"
         else
@@ -182,9 +182,11 @@ module PoolParty
         }
       end
       # Convenience method to grab the installer
-      def installer_for(name)
-        self.class.installers[name.to_sym]
+      def installer_for(names=[])
+        packages = names.is_a?(Array) ? names.join(" ") : names
+        "#{self.class.installers[@os]} #{packages}"
       end
+      
       # Install from the class-level
       def self.install(instance, cl=self)
         new(instance, cl).install

data/lib/poolparty/helpers/provisioners/master.rb

@@ -16,7 +16,10 @@ module PoolParty
 
       def install_tasks
         [
+          upgrade_system,
           install_puppet_master,
+          install_haproxy,
+          install_heartbeat,
           create_local_hosts_entry,
           setup_basic_structure,
           setup_configs,        
@@ -34,9 +37,30 @@ module PoolParty
           restart_puppetd
         ]
       end
+      
+      def upgrade_system
+        case @os
+        when :ubuntu
+          "
+          touch /etc/apt/sources.list
+          echo 'deb http://mirrors.kernel.org/ubuntu hardy main universe' >> /etc/apt/sources.list
+          apt-get update --fix-missing -y
+          apt-get upgrade -y"
+        else
+          "# No system upgrade needed"
+        end
+      end
 
       def install_puppet_master
-        "#{installer_for(@os)} #{get_puppet_packages_for(@os)}"
+        "#{installer_for( puppet_packages )}"
+      end
+      
+      def install_haproxy
+        "#{installer_for( "haproxy" )}"
+      end
+      
+      def install_heartbeat        
+        "#{installer_for( "heartbeat-2" )}"
       end
 
       def create_local_hosts_entry
@@ -105,15 +129,25 @@ mv #{Base.remote_storage_path}/#{Base.template_directory}/* #{Base.template_path
       def create_poolparty_manifest
         <<-EOS
 mv #{Base.remote_storage_path}/#{Base.tmp_path}/poolparty.pp /etc/puppet/manifests/classes/poolparty.pp
+mv #{Base.remote_storage_path}/#{Base.tmp_path}/#{Base.key_file_locations.first} "#{Base.base_config_directory}/.ppkeys"
+mv #{Base.remote_storage_path}/#{Base.tmp_path}/#{Base.default_specfile_name} #{Base.base_config_directory}/#{Base.default_specfile_name}
+mv #{Base.remote_storage_path}/#{Base.tmp_path}/#{@cloud.full_keypair_name} #{@cloud.remote_keypair_path}
         EOS
       end
 
       def start_puppetmaster
-"puppetmasterd && puppetd --listen"
+        <<-EOS
+ps aux | grep puppetmasterd | awk '{print $2}' | xargs kill
+rm -rf /etc/puppet/ssl
+puppetmasterd
+        EOS
       end    
 
-      def restart_puppetd # && puppetrun --host 127.0.0.1
-        # "puppetd --listen"
+      def restart_puppetd
+        <<-EOS
+          puppetd --test
+          puppetd --listen
+        EOS
       end
     end
   end

data/lib/poolparty/helpers/provisioners/slave.rb

@@ -18,8 +18,8 @@ module PoolParty
 
       def install_puppet
         <<-EOE        
-          #{installer_for(@os)} #{get_puppet_packages_for(@os)}
-          echo 'DAEMON_OPTS="-w 120 –server puppet"' > /etc/default/puppet
+          #{installer_for( puppet_packages )}
+          echo 'DAEMON_OPTS="-w 120 --server puppet"' > /etc/default/puppet
         EOE
       end
 

data/lib/poolparty/modules/cloud_resourcer.rb

@@ -3,6 +3,10 @@ require "ftools"
 module PoolParty
   module CloudResourcer
     
+    # Store block
+    def store_block(&block)
+      @store_block ||= block
+    end
     # Set instances with a range
     def instances(arg)
       if arg.is_a?(Range)
@@ -29,6 +33,19 @@ module PoolParty
       return nil
     end
     
+    def full_keypair_name
+      keypair_paths.each do |path|
+        possible_keypair_basenames.each do |base|
+          full_path = ::File.join( File.expand_path(path), "#{base}#{keypair}")
+          return "#{base}#{keypair}" if ::File.exists?(full_path)
+        end
+      end
+      return nil
+    end
+    
+    def remote_keypair_path
+      ::File.join( keypair_paths.last, "#{possible_keypair_basenames.first}#{keypair}" )
+    end
     def new_keypair_path
       ::File.join( keypair_paths.first, "#{possible_keypair_basenames.first}#{keypair}" )
     end
@@ -49,12 +66,12 @@ module PoolParty
     end
     
     # Set the parent on the resource
-    def set_parent(pare)
-      @parent = pare
+    def set_parent(pare, sink_options=true)
+      @parent = pare      
       # Add self as a service on the parent
       pare.add_service(self) if pare.respond_to?(:add_service)
       # Take the options of the parents
-      configure(pare.options) if pare.respond_to?(:options)
+      configure(pare.options) if pare.respond_to?(:options) && sink_options
     end
     
     def number_of_resources

data/lib/poolparty/modules/definable_resource.rb

@@ -42,7 +42,7 @@ module PoolParty
     # 
     # Which sets the virtual host's name as xnot.org
     # 
-    # This is included in the poolparty-apache-plugin
+    # An example is included in the poolparty-apache-plugin
     def virtual_resource(name=:virtual_resource, opts={}, &block)
       symc = "#{name}".classify
       eval <<-EOE

data/lib/poolparty/modules/method_missing_sugar.rb

@@ -4,13 +4,21 @@ module PoolParty
     def method_missing(m, *args, &block)
       if block_given?
         (args[0].class == self.class) ? args[0].instance_eval(&block) : super
-      else
-        get_from_options(m, *args)
+      else        
+        get_from_options(m, *args, &block)
       end
     end
     
-    def get_from_options(m, *args)
-      args.empty? ? options[m] : options[m] = (args.is_a?(Array) && args.size > 1) ? args : args[0]
+    def get_from_options(m, *args, &block)
+      if args.empty?
+        if options.has_key?(m)
+          options[m]
+        else
+          (parent.nil? || parent.class == self.class || !parent.respond_to?(:options) || parent.options.has_key?(m)) ? nil : parent.send(m, *args, &block)
+        end        
+      else
+        options[m] = (args.is_a?(Array) && args.size > 1) ? args : args[0]
+      end
     end
     
   end