auser-poolparty 0.2.8 → 0.2.9

data/Manifest.txt

@@ -25,6 +25,7 @@ bin/pool-provision
 bin/pool-spec
 bin/pool-start
 bin/pool-start-monitor
+bin/server-list-active
 config/hoe.rb
 config/requirements.rb
 examples/basic.rb
@@ -106,13 +107,17 @@ lib/poolparty/pool/resources/sshkey.rb
 lib/poolparty/pool/resources/symlink.rb
 lib/poolparty/pool/resources/variable.rb
 lib/poolparty/pool/script.rb
+lib/poolparty/puppet_plugins/poolparty/plugins/puppet/parser/functions/activenodeips.rb
+lib/poolparty/puppet_plugins/poolparty/plugins/puppet/parser/functions/activenodenames.rb
 lib/poolparty/templates/authkeys
 lib/poolparty/templates/cib.xml
 lib/poolparty/templates/fileserver.conf
 lib/poolparty/templates/gem
 lib/poolparty/templates/ha.cf
 lib/poolparty/templates/haproxy.conf
+lib/poolparty/templates/haresources
 lib/poolparty/templates/namespaceauth.conf
+lib/poolparty/templates/poolparty.monitor
 lib/poolparty/templates/puppet.conf
 lib/poolparty/version.rb
 lib/poolpartycl.rb
@@ -143,7 +148,6 @@ spec/poolparty/modules/configurable_spec.rb
 spec/poolparty/modules/definable_resource.rb
 spec/poolparty/modules/file_writer_spec.rb
 spec/poolparty/modules/s3_string_spec.rb
-spec/poolparty/modules/tmp/willy/nilly.rb
 spec/poolparty/net/remote_bases/ec2_spec.rb
 spec/poolparty/net/remote_instance_spec.rb
 spec/poolparty/net/remote_spec.rb

data/bin/cloud

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"

data/bin/pool

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"

data/bin/server-list-active

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+require "poolpartycl"
+
+o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
+  opts.on('-c name', '--class name', 'Listing for cloud class (valid args: [name|ip])')    { |t| optioner.classname t }
+  opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
+end
+
+load_pool(o.spec || Binary.get_existing_spec_location)
+
+@ctype = (o.classname || "name").downcase.to_sym
+
+include Remote
+
+@clouds = o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds
+
+@clouds.each do |name, cloud|
+  
+  with_cloud(cloud, {:location => @location, :ctype => @ctype}) do
+    puts "[ #{list_of_running_instances.map{|a| "'#{a.send ctype}'" }.join(", ")} ]"
+  end  
+  
+end

data/lib/poolparty/base_packages/haproxy.rb

@@ -21,8 +21,8 @@ module PoolParty
 
           # Tempalte variables
           variable(:name => "name_haproxy", :value => "#{@parent.name}")
-          variable(:name => "nodenames_haproxy", :value => list_of_node_names)
-          variable(:name => "node_ips_haproxy",  :value => list_of_node_ips)
+          variable(:name => "nodenames_haproxy", :value => 'generate(". /etc/profile && server-list-active -c name")')
+          variable(:name => "node_ips_haproxy",  :value => 'generate(". /etc/profile && server-list-active -c ip")')
           variable(:name => "ports_haproxy", :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))

data/lib/poolparty/base_packages/heartbeat.rb

@@ -12,8 +12,9 @@ module PoolParty
           has_exec(:name => "heartbeat-update-cib", :command => "/usr/sbin/cibadmin -R -x /etc/ha.d/cib.xml", :refreshonly => true)
         
           # variables for the templates
-          has_variable({:name => "ha_nodenames", :value => list_of_node_names})
-          has_variable({:name => "ha_node_ips",  :value => list_of_node_ips})
+          variable(:name => "ha_nodenames", :value => 'generate(". /etc/profile && server-list-active -c name")')
+          variable(:name => "ha_node_ips",  :value => 'generate(". /etc/profile && server-list-active -c ip")')
+          
           has_variable({:name => "ha_timeout",  :value => (self.respond_to?(:timeout) ? timeout : "5s")})
           has_variable({:name => "ha_port", :value => (self.respond_to?(:port) ? port : Base.port)})
           
@@ -38,6 +39,15 @@ module PoolParty
             notify 'Exec["heartbeat-update-cib"]'
             template File.join(File.dirname(__FILE__), "..", "templates/cib.xml")
           end
+          
+        end
+        
+        execute_if("$hostname", "master") do
+          if list_of_node_names.size > 1
+            has_exec(:name => "update pem for heartbeat", :refreshonly => true) do
+              command "scp /etc/puppet/ssl/ca/ca_crl.pem #{user || Base.user}@#{list_of_node_ips[1]}:/etc/puppet/ssl/ca"
+            end
+          end
         end
         
       end

data/lib/poolparty/base_packages/poolparty.rb

@@ -25,8 +25,10 @@ module PoolParty
         end
         
         #  -n #{parent.name}
-        has_cron({:command => ". /etc/profile && which cloud-maintain | /bin/sh"}) do
-          minute "*/2"
+        execute_if("$hostname", "master") do
+          has_cron({:command => ". /etc/profile && which cloud-maintain | /bin/sh"}) do
+            minute "*/5"
+          end
         end
         # has_host(:name => "puppet", :ip => (self.respond_to?(:master) ? self : parent).master.ip)
       end

data/lib/poolparty/core/string.rb

@@ -35,10 +35,11 @@ class String
   def to_option_string(ns=[])
     a_template = (self =~ /template/) == 0
     a_service = self =~ /^[A-Z][a-zA-Z]*\[[a-zA-Z0-9\-\.\"\'_\$\{\}\/]*\]/
+    a_function = self =~/(.)*\((.)*\)(.)*/
     if is_a?(PoolParty::Resources::Resource)
       self.to_s
     else
-      (a_service || a_template) ? "#{self}" : "'#{self}'"
+      (a_service || a_template || a_function) ? self : "'#{self}'"
     end    
   end
   # Refactor this guy to get the class if the class is defined, and not always create a new one

data/lib/poolparty/helpers/provisioner_base.rb

@@ -137,7 +137,7 @@ module PoolParty
         [
           upgrade_system,
           fix_rubygems,
-          install_puppet_master,
+          install_puppet,
           custom_install_tasks
         ] << install_tasks
       end
@@ -237,7 +237,7 @@ module PoolParty
         end
       end
       
-      def install_puppet_master
+      def install_puppet
         "#{installer_for( puppet_packages )}"
       end
 

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

@@ -32,19 +32,13 @@ module PoolParty
           start_puppetmaster,
           create_local_node,
           move_templates,
+          move_plugins,
           create_poolparty_manifest,
           restart_puppetd
         ]
       end
       
-      # def install_haproxy
-      #   "#{installer_for( "haproxy" )}"
-      # end
-      # 
-      # def install_heartbeat        
-      #   "#{installer_for( "heartbeat-2" )}"
-      # end
-
+      # If the master is not in the hosts file, then add it to the hosts file
       def create_local_hosts_entry
         <<-EOS
 if [ -z \"$(grep -v '#' /etc/hosts | grep 'master')" ]; then echo '#{@master_ip}           puppet master' >> /etc/hosts; fi
@@ -107,6 +101,15 @@ mkdir -p #{Base.template_path}
 cp #{Base.remote_storage_path}/#{Base.template_directory}/* #{Base.template_path}
         EOS
       end
+      
+      def move_plugins
+        <<-EOS
+mkdir -p #{Base.module_path}
+cp -R #{Base.remote_storage_path}/#{Base.plugin_directory}/ #{Base.module_path}
+mkdir -p /var/lib/puppet/lib/parser/functions/
+cp -R #{Base.remote_storage_path}/#{Base.plugin_directory}/puppet/* /var/lib/puppet/lib/parser/functions/
+        EOS
+      end
 
       def create_poolparty_manifest
         <<-EOS

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

@@ -18,19 +18,19 @@ module PoolParty
       def setup_puppet
         <<-EOE
           if [ -z "$(grep -v '#' /etc/hosts | grep 'master')" ]; then echo "#{master_ip} puppet master" >> /etc/hosts; else echo "host already set"; fi
-          mv #{Base.remote_storage_path}/#{Base.tmp_path}/namespaceauth.conf /etc/puppet/namespaceauth.conf
+          cp #{Base.remote_storage_path}/#{Base.tmp_path}/namespaceauth.conf /etc/puppet/namespaceauth.conf
         EOE
       end
 
       def setup_configs
-        <<-EOS
-          /etc/init.d/puppetmasterd stop
+        <<-EOS          
           echo "#{open(File.join(template_directory, "puppet.conf")).read}" > /etc/puppet/puppet.conf        
         EOS
       end
 
       def start_puppet
         <<-EOS
+/etc/init.d/puppetmasterd stop
 puppetd --listen --fqdn #{@instance.name}
         EOS
       end

data/lib/poolparty/modules/file_writer.rb

@@ -10,6 +10,11 @@ module PoolParty
       path = ::File.join( Base.template_directory, ::File.basename(file) )
       FileUtils.cp file, path
     end
+    def copy_plugin_to_storage_directory(file)
+      make_plugin_directory
+      path = ::File.join( Base.plugin_directory, ::File.basename(file) )
+      FileUtils.cp file, path
+    end
     def write_to_file_in_storage_directory(file, str, &block)
       path = ::File.join( Base.storage_directory, ::File.basename(file) )
       write_to_file(path, str, &block)
@@ -48,6 +53,9 @@ module PoolParty
     def make_template_directory
       FileUtils.mkdir_p Base.template_directory unless ::File.directory?(Base.template_directory)      
     end
+    def make_plugin_directory
+      FileUtils.mkdir_p Base.plugin_directory unless ::File.directory?(Base.plugin_directory)
+    end
     def clear_base_directory
       FileUtils::rm_rf "#{Base.storage_directory}"
     end

data/lib/poolparty/net/remote_instance.rb

@@ -61,7 +61,7 @@ module PoolParty
       # Printing. This is how we extract the instances into the listing on the 
       # local side into the local listing file
       def to_s
-        "#{name} #{ip}"
+        "#{name}\t#{ip}"
       end
     end
     

data/lib/poolparty/pool/base.rb

@@ -14,12 +14,13 @@ module PoolParty
       :user => "root", # This should change here
       :base_keypair_path => "~/.ec2",
       :tmp_path => "tmp",
-      :remote_storage_path => "/var/poolparty",
-      :storage_directory => File.join(Dir.pwd, "tmp"),
+      :remote_storage_path => "/var/poolparty",      
       :fileserver_base => "puppet:///files",
       :base_config_directory => "/etc/poolparty",
       :template_directory => "tmp/templates",
+      :plugin_directory => "tmp/plugins",
       :template_path => "/var/lib/puppet/templates",
+      :module_path => "/etc/puppet/modules/poolparty",
       :default_specfile_name => "pool.spec",
       :port => "80",
       :forwarding_port => "8080",
@@ -68,6 +69,14 @@ module PoolParty
           "ppkeys"
         ]
       end
+            
+      def storage_directory
+        [
+            "/var/poolparty"           
+        ].select do |dir|
+          dir if ::File.directory?(dir) && ::File.readable?(dir)
+        end.first || ::File.join(Dir.pwd, "tmp")
+      end
       
       def pool_logger_location
         File.join(Dir.pwd, "logs")

data/lib/poolparty/pool/cloud.rb

@@ -54,11 +54,14 @@ module PoolParty
       def keypair(*args)
         has_keypair? ? options[:keypair] : generate_keypair(*args)
       end
+      # Let's just make sure that the keypair exists on the options
       def has_keypair?
         options.has_key?(:keypair) && options[:keypair]
       end
+      # Generate a keypair based on the parent's name (if there is a parent)
+      # and the cloud's name
       def generate_keypair(*args)
-        options[:keypair] = args.length > 0 ? args[0] : "#{@parent.respond_to?(:name) ? @parent.name : ""}_#{@name}"
+        options[:keypair] = args.length > 0 ? args[0] : "#{@parent && @parent.respond_to?(:name) ? @parent.name : ""}_#{@name}"
       end
       
       # Prepare to send the new configuration to the instances
@@ -73,6 +76,7 @@ module PoolParty
         # clear_base_directory
         make_base_directory
         copy_misc_templates
+        copy_puppet_functions
         Base.store_keys_in_file
         Script.save!
         copy_ssh_key # not my favorite...
@@ -105,6 +109,12 @@ module PoolParty
         end
       end
       
+      # TODO: Fix for windowz
+      def copy_puppet_functions
+        cmd = "cp -R #{::File.join(::File.dirname(__FILE__), "..", "puppet_plugins/")} #{Base.storage_directory}/plugins"
+        %x[#{cmd}]
+      end
+      
       # Configuration files
       def build_manifest
         @build_manifest ||= build_from_existing_file

data/lib/poolparty/pool/loggable.rb

@@ -1,3 +1,6 @@
+=begin rdoc
+  A logging class to allow us to log to locations
+=end
 class Loggable
   def initialize
     Logging.init :debug, :info, :warn, :error, :fatal

data/lib/poolparty/pool/pool.rb

@@ -39,7 +39,7 @@ module PoolParty
       end
       
       def plugin_directory(*args)
-        args.each {|arg| Dir["#{arg}/*.rb"].each {|f| load f }}
+        args.each {|arg| Dir["#{arg}/*/*.rb"].each {|f| require f }}
       end
             
       # This is where the entire process starts

data/lib/poolparty/pool/resources/variable.rb

@@ -13,12 +13,13 @@ module PoolParty
       end
       
       def value_string
-        case value.class.to_s
-        when "Array"
-          "[ #{value.map{|a| "'#{a}'"}.join(", ")} ]"
-        else
-          "'#{value}'"
-        end
+        value.to_option_string
+        # case value.class.to_s
+        # when "Array"
+        #   "[ #{value.map{|a| "'#{a}'"}.join(", ")} ]"
+        # else
+        #   "'#{value}'"
+        # end
       end
       
     end

data/lib/poolparty/puppet_plugins/poolparty/plugins/puppet/parser/functions/activenodeips.rb

@@ -0,0 +1,11 @@
+module Puppet::Parser::Functions
+  newfunction(:active_node_ips, :type => :rvalue) do |args|
+    output = []
+    ret = %x[. /etc/profile && cloud-list]
+    active_node_list = ret.split(/\n/).map {|a| a.chomp}.reject {|a| a.nil? || a.empty? || a =~ /\*\*/}    
+    active_node_list.each do |line|
+      output << line.split(/\t/)[1]
+    end
+    output
+  end
+end

data/lib/poolparty/puppet_plugins/poolparty/plugins/puppet/parser/functions/activenodenames.rb

@@ -0,0 +1,11 @@
+module Puppet::Parser::Functions
+  newfunction(:active_node_names, :type => :rvalue) do |args|
+    output = []
+    ret = %x[. /etc/profile && cloud-list]
+    active_node_list = ret.split(/\n/).map {|a| a.chomp}.reject {|a| a.nil? || a.empty? || a =~ /\*\*/}    
+    active_node_list.each do |line|
+      output << line.split(/\t/)[0]
+    end
+    output
+  end
+end

data/lib/poolparty/templates/ha.cf

@@ -1,4 +1,4 @@
-# Haproxy conf
+# Heartbeat
 keepalive 2 # Time inbetween heartbeats
 deadtime 32 # wait 32 seconds before declaring dead
 warntime 16 # issue a warning halfway through
@@ -7,6 +7,13 @@ logfacility daemon         # Log to syslog as facility "daemon"
 auto_failback off
 use_logd yes
 bcast eth0
-crm respawn
+crm on
+logfile /var/log/ha.log
+
+<% ha_node_ips.each_with_index do |ip,index| -%>
+  <% if $hostname != ha_nodenames[index] -%>
+  ucast eth0 <%= ip %>
+  <% end %>
+<% end %>
 
 node <%= ha_nodenames.join(" ") %>

data/lib/poolparty/templates/haresources

@@ -0,0 +1,3 @@
+<% ha_nodenames.each_with_index do |name, index| -%>
+<%= name -%>       <%= ha_node_ips[index] -%>/eth0:0
+<% end %>

data/lib/poolparty/templates/poolparty.monitor

@@ -0,0 +1,14 @@
+#!/bin/bash
+# Based on puppet High Availability recipe
+# 
+# http://reductivelabs.com/trac/puppet/wiki/Recipes/HighAvailability
+# Modified for PoolParty
+# 
+exitstatus=0
+processid=`ps aux | grep puppetmasterd | awk '{print $2}'`
+
+if [ -z $processid ] || test `netstat -apn | grep "${processid}/ruby" | wc -l` -eq 0  ; then
+  exitstatus=1
+fi
+
+exit $exitstatus

data/lib/poolparty/templates/puppet.conf

@@ -1,12 +1,11 @@
 [main]
   vardir = /var/lib/puppet
   logdir = /var/log/puppet
-  templatepath = /var/lib/puppet/templates
+  pluginsync=true
+  factsync=false
  
 [puppetd]
-  localconfig = $vardir/localconfig
-  pluginsync=false
-  factsync=false
+  localconfig = $vardir/localconfig      
   report=true
   server=master
 

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 8
+    TINY  = 9
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/poolparty.gemspec

@@ -1,15 +1,15 @@
 Gem::Specification.new do |s|
   s.name = %q{poolparty}
-  s.version = "0.2.8"
+  s.version = "0.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ari Lerner"]
-  s.date = %q{2008-10-15}
+  s.date = %q{2008-10-16}
   s.description = %q{Self-healing, auto-scaling cloud computing tool}
   s.email = ["ari.lerner@citrusbyte.com"]
-  s.executables = ["cloud", "cloud-add-keypair", "cloud-configure", "cloud-contract", "cloud-expand", "cloud-list", "cloud-maintain", "cloud-osxcopy", "cloud-provision", "cloud-refresh", "cloud-ssh", "cloud-start", "cloud-terminate", "pool", "pool-console", "pool-describe", "pool-list", "pool-provision", "pool-spec", "pool-start", "pool-start-monitor"]
+  s.executables = ["cloud", "cloud-add-keypair", "cloud-configure", "cloud-contract", "cloud-expand", "cloud-list", "cloud-maintain", "cloud-osxcopy", "cloud-provision", "cloud-refresh", "cloud-ssh", "cloud-start", "cloud-terminate", "pool", "pool-console", "pool-describe", "pool-list", "pool-provision", "pool-spec", "pool-start", "pool-start-monitor", "server-list-active"]
   s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "PostInstall.txt", "README.txt", "website/index.txt"]
-  s.files = ["History.txt", "License.txt", "Manifest.txt", "PostInstall.txt", "README.txt", "Rakefile", "bin/cloud", "bin/cloud-add-keypair", "bin/cloud-configure", "bin/cloud-contract", "bin/cloud-expand", "bin/cloud-list", "bin/cloud-maintain", "bin/cloud-osxcopy", "bin/cloud-provision", "bin/cloud-refresh", "bin/cloud-ssh", "bin/cloud-start", "bin/cloud-terminate", "bin/pool", "bin/pool-console", "bin/pool-describe", "bin/pool-list", "bin/pool-provision", "bin/pool-spec", "bin/pool-start", "bin/pool-start-monitor", "config/hoe.rb", "config/requirements.rb", "examples/basic.rb", "examples/plugin_without_plugin_directory.rb", "examples/poolparty.rb", "examples/with_apache_plugin.rb", "generators/poolspec/USAGE", "generators/poolspec/poolspec_generator.rb", "generators/poolspec/templates/pool_spec_template.erb", "lib/erlang/eb_server.erl", "lib/poolparty.rb", "lib/poolparty/base_packages/haproxy.rb", "lib/poolparty/base_packages/heartbeat.rb", "lib/poolparty/base_packages/poolparty.rb", "lib/poolparty/base_packages/ruby.rb", "lib/poolparty/core/array.rb", "lib/poolparty/core/exception.rb", "lib/poolparty/core/float.rb", "lib/poolparty/core/hash.rb", "lib/poolparty/core/kernel.rb", "lib/poolparty/core/module.rb", "lib/poolparty/core/my_open_struct.rb", "lib/poolparty/core/object.rb", "lib/poolparty/core/proc.rb", "lib/poolparty/core/string.rb", "lib/poolparty/core/symbol.rb", "lib/poolparty/core/time.rb", "lib/poolparty/exceptions/RemoteException.rb", "lib/poolparty/exceptions/ResourceException.rb", "lib/poolparty/exceptions/RuntimeException.rb", "lib/poolparty/exceptions/SpecException.rb", "lib/poolparty/exceptions/TemplateNotFound.rb", "lib/poolparty/helpers/binary.rb", "lib/poolparty/helpers/console.rb", "lib/poolparty/helpers/display.rb", "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_resourcer.rb", "lib/poolparty/modules/configurable.rb", "lib/poolparty/modules/definable_resource.rb", "lib/poolparty/modules/file_writer.rb", "lib/poolparty/modules/method_missing_sugar.rb", "lib/poolparty/modules/output.rb", "lib/poolparty/modules/pretty_printer.rb", "lib/poolparty/modules/s3_string.rb", "lib/poolparty/modules/safe_instance.rb", "lib/poolparty/monitors/base_monitor.rb", "lib/poolparty/net/remote.rb", "lib/poolparty/net/remote_bases/ec2.rb", "lib/poolparty/net/remote_instance.rb", "lib/poolparty/net/remoter.rb", "lib/poolparty/net/remoter_base.rb", "lib/poolparty/plugins/gem_package.rb", "lib/poolparty/plugins/git.rb", "lib/poolparty/plugins/line.rb", "lib/poolparty/plugins/svn.rb", "lib/poolparty/pool/base.rb", "lib/poolparty/pool/cloud.rb", "lib/poolparty/pool/custom_resource.rb", "lib/poolparty/pool/loggable.rb", "lib/poolparty/pool/plugin.rb", "lib/poolparty/pool/plugin_model.rb", "lib/poolparty/pool/pool.rb", "lib/poolparty/pool/resource.rb", "lib/poolparty/pool/resources/class_package.rb", "lib/poolparty/pool/resources/conditional.rb", "lib/poolparty/pool/resources/cron.rb", "lib/poolparty/pool/resources/directory.rb", "lib/poolparty/pool/resources/exec.rb", "lib/poolparty/pool/resources/file.rb", "lib/poolparty/pool/resources/gem.rb", "lib/poolparty/pool/resources/host.rb", "lib/poolparty/pool/resources/package.rb", "lib/poolparty/pool/resources/remote_file.rb", "lib/poolparty/pool/resources/service.rb", "lib/poolparty/pool/resources/sshkey.rb", "lib/poolparty/pool/resources/symlink.rb", "lib/poolparty/pool/resources/variable.rb", "lib/poolparty/pool/script.rb", "lib/poolparty/templates/authkeys", "lib/poolparty/templates/cib.xml", "lib/poolparty/templates/fileserver.conf", "lib/poolparty/templates/gem", "lib/poolparty/templates/ha.cf", "lib/poolparty/templates/haproxy.conf", "lib/poolparty/templates/namespaceauth.conf", "lib/poolparty/templates/puppet.conf", "lib/poolparty/version.rb", "lib/poolpartycl.rb", "poolparty.gemspec", "script/destroy", "script/generate", "script/txt2html", "setup.rb", "spec/poolparty/base_packages/haproxy_spec.rb", "spec/poolparty/base_packages/heartbeat_spec.rb", "spec/poolparty/bin/console_spec.rb", "spec/poolparty/core/array_spec.rb", "spec/poolparty/core/float.rb", "spec/poolparty/core/hash_spec.rb", "spec/poolparty/core/kernel_spec.rb", "spec/poolparty/core/module_spec.rb", "spec/poolparty/core/object_spec.rb", "spec/poolparty/core/string_spec.rb", "spec/poolparty/core/time_spec.rb", "spec/poolparty/helpers/binary_spec.rb", "spec/poolparty/helpers/display_spec.rb", "spec/poolparty/helpers/optioner_spec.rb", "spec/poolparty/helpers/provisioner_base_spec.rb", "spec/poolparty/helpers/provisioners/master_spec.rb", "spec/poolparty/helpers/provisioners/slave_spec.rb", "spec/poolparty/modules/cloud_resourcer_spec.rb", "spec/poolparty/modules/configurable_spec.rb", "spec/poolparty/modules/definable_resource.rb", "spec/poolparty/modules/file_writer_spec.rb", "spec/poolparty/modules/s3_string_spec.rb", "spec/poolparty/modules/tmp/willy/nilly.rb", "spec/poolparty/net/remote_bases/ec2_spec.rb", "spec/poolparty/net/remote_instance_spec.rb", "spec/poolparty/net/remote_spec.rb", "spec/poolparty/net/remoter_base_spec.rb", "spec/poolparty/net/remoter_spec.rb", "spec/poolparty/plugins/git_spec.rb", "spec/poolparty/plugins/line_spec.rb", "spec/poolparty/plugins/svn_spec.rb", "spec/poolparty/pool/base_spec.rb", "spec/poolparty/pool/cloud_spec.rb", "spec/poolparty/pool/configurers/files/ruby_basic.rb", "spec/poolparty/pool/configurers/files/ruby_plugins.rb", "spec/poolparty/pool/configurers/ruby_spec.rb", "spec/poolparty/pool/custom_resource_spec.rb", "spec/poolparty/pool/example_spec.rb", "spec/poolparty/pool/plugin_model_spec.rb", "spec/poolparty/pool/plugin_spec.rb", "spec/poolparty/pool/pool_spec.rb", "spec/poolparty/pool/resource_spec.rb", "spec/poolparty/pool/resources/class_package_spec.rb", "spec/poolparty/pool/resources/conditional_spec.rb", "spec/poolparty/pool/resources/cron_spec.rb", "spec/poolparty/pool/resources/directory_spec.rb", "spec/poolparty/pool/resources/exec_spec.rb", "spec/poolparty/pool/resources/file_spec.rb", "spec/poolparty/pool/resources/gem_spec.rb", "spec/poolparty/pool/resources/host_spec.rb", "spec/poolparty/pool/resources/package_spec.rb", "spec/poolparty/pool/resources/remote_file_spec.rb", "spec/poolparty/pool/resources/service_spec.rb", "spec/poolparty/pool/resources/sshkey_spec.rb", "spec/poolparty/pool/resources/symlink_spec.rb", "spec/poolparty/pool/resources/variable_spec.rb", "spec/poolparty/pool/script_spec.rb", "spec/poolparty/pool/test_plugins/sshkey_test", "spec/poolparty/pool/test_plugins/virtual_host_template.erb", "spec/poolparty/pool/test_plugins/webserver.rb", "spec/poolparty/poolparty_spec.rb", "spec/poolparty/spec_helper.rb", "tasks/cloud.rake", "tasks/deployment.rake", "tasks/development.rake", "tasks/ec2.rake", "tasks/environment.rake", "tasks/instance.rake", "tasks/server.rake", "tasks/spec.rake", "tasks/website.rake", "test/test_generator_helper.rb", "test/test_helper.rb", "test/test_pool_spec_generator.rb", "test/test_poolparty.rb", "test_manifest.pp", "website/index.html", "website/index.txt", "website/javascripts/rounded_corners_lite.inc.js", "website/stylesheets/code.css", "website/stylesheets/screen.css", "website/template.html.erb"]
+  s.files = ["History.txt", "License.txt", "Manifest.txt", "PostInstall.txt", "README.txt", "Rakefile", "bin/cloud", "bin/cloud-add-keypair", "bin/cloud-configure", "bin/cloud-contract", "bin/cloud-expand", "bin/cloud-list", "bin/cloud-maintain", "bin/cloud-osxcopy", "bin/cloud-provision", "bin/cloud-refresh", "bin/cloud-ssh", "bin/cloud-start", "bin/cloud-terminate", "bin/pool", "bin/pool-console", "bin/pool-describe", "bin/pool-list", "bin/pool-provision", "bin/pool-spec", "bin/pool-start", "bin/pool-start-monitor", "bin/server-list-active", "config/hoe.rb", "config/requirements.rb", "examples/basic.rb", "examples/plugin_without_plugin_directory.rb", "examples/poolparty.rb", "examples/with_apache_plugin.rb", "generators/poolspec/USAGE", "generators/poolspec/poolspec_generator.rb", "generators/poolspec/templates/pool_spec_template.erb", "lib/erlang/eb_server.erl", "lib/poolparty.rb", "lib/poolparty/base_packages/haproxy.rb", "lib/poolparty/base_packages/heartbeat.rb", "lib/poolparty/base_packages/poolparty.rb", "lib/poolparty/base_packages/ruby.rb", "lib/poolparty/core/array.rb", "lib/poolparty/core/exception.rb", "lib/poolparty/core/float.rb", "lib/poolparty/core/hash.rb", "lib/poolparty/core/kernel.rb", "lib/poolparty/core/module.rb", "lib/poolparty/core/my_open_struct.rb", "lib/poolparty/core/object.rb", "lib/poolparty/core/proc.rb", "lib/poolparty/core/string.rb", "lib/poolparty/core/symbol.rb", "lib/poolparty/core/time.rb", "lib/poolparty/exceptions/RemoteException.rb", "lib/poolparty/exceptions/ResourceException.rb", "lib/poolparty/exceptions/RuntimeException.rb", "lib/poolparty/exceptions/SpecException.rb", "lib/poolparty/exceptions/TemplateNotFound.rb", "lib/poolparty/helpers/binary.rb", "lib/poolparty/helpers/console.rb", "lib/poolparty/helpers/display.rb", "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_resourcer.rb", "lib/poolparty/modules/configurable.rb", "lib/poolparty/modules/definable_resource.rb", "lib/poolparty/modules/file_writer.rb", "lib/poolparty/modules/method_missing_sugar.rb", "lib/poolparty/modules/output.rb", "lib/poolparty/modules/pretty_printer.rb", "lib/poolparty/modules/s3_string.rb", "lib/poolparty/modules/safe_instance.rb", "lib/poolparty/monitors/base_monitor.rb", "lib/poolparty/net/remote.rb", "lib/poolparty/net/remote_bases/ec2.rb", "lib/poolparty/net/remote_instance.rb", "lib/poolparty/net/remoter.rb", "lib/poolparty/net/remoter_base.rb", "lib/poolparty/plugins/gem_package.rb", "lib/poolparty/plugins/git.rb", "lib/poolparty/plugins/line.rb", "lib/poolparty/plugins/svn.rb", "lib/poolparty/pool/base.rb", "lib/poolparty/pool/cloud.rb", "lib/poolparty/pool/custom_resource.rb", "lib/poolparty/pool/loggable.rb", "lib/poolparty/pool/plugin.rb", "lib/poolparty/pool/plugin_model.rb", "lib/poolparty/pool/pool.rb", "lib/poolparty/pool/resource.rb", "lib/poolparty/pool/resources/class_package.rb", "lib/poolparty/pool/resources/conditional.rb", "lib/poolparty/pool/resources/cron.rb", "lib/poolparty/pool/resources/directory.rb", "lib/poolparty/pool/resources/exec.rb", "lib/poolparty/pool/resources/file.rb", "lib/poolparty/pool/resources/gem.rb", "lib/poolparty/pool/resources/host.rb", "lib/poolparty/pool/resources/package.rb", "lib/poolparty/pool/resources/remote_file.rb", "lib/poolparty/pool/resources/service.rb", "lib/poolparty/pool/resources/sshkey.rb", "lib/poolparty/pool/resources/symlink.rb", "lib/poolparty/pool/resources/variable.rb", "lib/poolparty/pool/script.rb", "lib/poolparty/puppet_plugins/poolparty/plugins/puppet/parser/functions/activenodeips.rb", "lib/poolparty/puppet_plugins/poolparty/plugins/puppet/parser/functions/activenodenames.rb", "lib/poolparty/templates/authkeys", "lib/poolparty/templates/cib.xml", "lib/poolparty/templates/fileserver.conf", "lib/poolparty/templates/gem", "lib/poolparty/templates/ha.cf", "lib/poolparty/templates/haproxy.conf", "lib/poolparty/templates/haresources", "lib/poolparty/templates/namespaceauth.conf", "lib/poolparty/templates/poolparty.monitor", "lib/poolparty/templates/puppet.conf", "lib/poolparty/version.rb", "lib/poolpartycl.rb", "poolparty.gemspec", "script/destroy", "script/generate", "script/txt2html", "setup.rb", "spec/poolparty/base_packages/haproxy_spec.rb", "spec/poolparty/base_packages/heartbeat_spec.rb", "spec/poolparty/bin/console_spec.rb", "spec/poolparty/core/array_spec.rb", "spec/poolparty/core/float.rb", "spec/poolparty/core/hash_spec.rb", "spec/poolparty/core/kernel_spec.rb", "spec/poolparty/core/module_spec.rb", "spec/poolparty/core/object_spec.rb", "spec/poolparty/core/string_spec.rb", "spec/poolparty/core/time_spec.rb", "spec/poolparty/helpers/binary_spec.rb", "spec/poolparty/helpers/display_spec.rb", "spec/poolparty/helpers/optioner_spec.rb", "spec/poolparty/helpers/provisioner_base_spec.rb", "spec/poolparty/helpers/provisioners/master_spec.rb", "spec/poolparty/helpers/provisioners/slave_spec.rb", "spec/poolparty/modules/cloud_resourcer_spec.rb", "spec/poolparty/modules/configurable_spec.rb", "spec/poolparty/modules/definable_resource.rb", "spec/poolparty/modules/file_writer_spec.rb", "spec/poolparty/modules/s3_string_spec.rb", "spec/poolparty/net/remote_bases/ec2_spec.rb", "spec/poolparty/net/remote_instance_spec.rb", "spec/poolparty/net/remote_spec.rb", "spec/poolparty/net/remoter_base_spec.rb", "spec/poolparty/net/remoter_spec.rb", "spec/poolparty/plugins/git_spec.rb", "spec/poolparty/plugins/line_spec.rb", "spec/poolparty/plugins/svn_spec.rb", "spec/poolparty/pool/base_spec.rb", "spec/poolparty/pool/cloud_spec.rb", "spec/poolparty/pool/configurers/files/ruby_basic.rb", "spec/poolparty/pool/configurers/files/ruby_plugins.rb", "spec/poolparty/pool/configurers/ruby_spec.rb", "spec/poolparty/pool/custom_resource_spec.rb", "spec/poolparty/pool/example_spec.rb", "spec/poolparty/pool/plugin_model_spec.rb", "spec/poolparty/pool/plugin_spec.rb", "spec/poolparty/pool/pool_spec.rb", "spec/poolparty/pool/resource_spec.rb", "spec/poolparty/pool/resources/class_package_spec.rb", "spec/poolparty/pool/resources/conditional_spec.rb", "spec/poolparty/pool/resources/cron_spec.rb", "spec/poolparty/pool/resources/directory_spec.rb", "spec/poolparty/pool/resources/exec_spec.rb", "spec/poolparty/pool/resources/file_spec.rb", "spec/poolparty/pool/resources/gem_spec.rb", "spec/poolparty/pool/resources/host_spec.rb", "spec/poolparty/pool/resources/package_spec.rb", "spec/poolparty/pool/resources/remote_file_spec.rb", "spec/poolparty/pool/resources/service_spec.rb", "spec/poolparty/pool/resources/sshkey_spec.rb", "spec/poolparty/pool/resources/symlink_spec.rb", "spec/poolparty/pool/resources/variable_spec.rb", "spec/poolparty/pool/script_spec.rb", "spec/poolparty/pool/test_plugins/sshkey_test", "spec/poolparty/pool/test_plugins/virtual_host_template.erb", "spec/poolparty/pool/test_plugins/webserver.rb", "spec/poolparty/poolparty_spec.rb", "spec/poolparty/spec_helper.rb", "tasks/cloud.rake", "tasks/deployment.rake", "tasks/development.rake", "tasks/ec2.rake", "tasks/environment.rake", "tasks/instance.rake", "tasks/server.rake", "tasks/spec.rake", "tasks/website.rake", "test/test_generator_helper.rb", "test/test_helper.rb", "test/test_pool_spec_generator.rb", "test/test_poolparty.rb", "test_manifest.pp", "website/index.html", "website/index.txt", "website/javascripts/rounded_corners_lite.inc.js", "website/stylesheets/code.css", "website/stylesheets/screen.css", "website/template.html.erb"]
   s.has_rdoc = true
   s.homepage = %q{http://poolparty.rubyforge.org}
   s.post_install_message = %q{Get ready to jump in the pool, you just installed poolpartyrb!

data/spec/poolparty/core/string_spec.rb

@@ -135,7 +135,13 @@ listen web_proxy 127.0.0.1:3000
       end
       @file = @cloud.resource(:file).first
       @file.to_option_string.should == "File['franke']"
-    end    
+    end
+    it "should turn a function into a string without quotes" do
+      "active_nodes()".to_option_string.should == "active_nodes()"
+    end
+    it "should turna function into a string outsid ethe quotes with a parameter" do
+      "active_nodes(10)".to_option_string.should == "active_nodes(10)"
+    end
   end
   describe "sanitize" do
     it "should remove the periods from the string" do

data/spec/poolparty/helpers/provisioners/master_spec.rb

@@ -18,7 +18,7 @@ describe "Master provisioner" do
       @master.stub!(:cloud).and_return @cloud
     end
     it "should call install_puppet_master" do
-      @master.should_receive(:install_puppet_master)
+      @master.should_receive(:install_puppet)
     end
     it "should call create_local_hosts_entry" do
       @master.should_receive(:create_local_hosts_entry)
@@ -37,7 +37,7 @@ describe "Master provisioner" do
     end
   end
   it "should return install_puppet_master as apt-get install puppet factor" do
-    @master.install_puppet_master.should =~ /apt-get install -y puppet puppetmaster/
+    @master.install_puppet.should =~ /apt-get install -y puppet puppetmaster/
   end
   it "should return setup basic structure" do
     @master.setup_basic_structure.should =~ /puppetmasterd --mkusers/

data/spec/poolparty/helpers/provisioners/slave_spec.rb

@@ -16,7 +16,7 @@ describe "Slave provisioner" do
   end
   describe "install_tasks" do
     it "should call install_puppet_slave" do
-      @slave.should_receive(:install_puppet_master)
+      @slave.should_receive(:install_puppet)
     end
     after do
       @slave.install

data/spec/poolparty/pool/pool_spec.rb

@@ -37,7 +37,7 @@ describe "Pool" do
         end
       end
       it "should call Dir when the plugin directory is set" do
-        Dir.should_receive(:[]).with("yaway/*.rb").once.and_return []        
+        Dir.should_receive(:[]).with("yaway/*/*.rb").once.and_return []        
       end
     end
     describe "configuration" do

data/spec/poolparty/pool/resources/variable_spec.rb

@@ -17,4 +17,8 @@ describe "Variable" do
     v = variable(:name => "girlfriends", :value => %w(Rachel Erica Michelle))
     v.to_string.should == "$girlfriends = [ 'Rachel', 'Erica', 'Michelle' ]"
   end
+  it "should set the string to be without a string if it's a function" do
+    v = variable(:name => "girlfriends", :value => "lookup_var()")
+    v.to_string.should == "$girlfriends = lookup_var()"
+  end
 end

data/website/index.html

@@ -34,7 +34,7 @@
     <h1>PoolParty</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/poolparty"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.8</a>
+      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.9</a>
     </div>
     <h1>&#8216;Easy cloud computing&#8217;</h1>
 <h2>What</h2>
@@ -78,7 +78,7 @@ cloud spec [name]
   <span class="keyword">end</span>
 </pre></p>
 <h2>Forum</h2>
-<p><a href="http://groups.google.com/group/PoolParty">http://groups.google.com/group/PoolParty</a></p>
+<p><a href="http://groups.google.com/group/poolpartyrb">http://groups.google.com/group/PoolPartyRb</a></p>
 <h2>How to submit patches</h2>
 <p>Read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people&#8217;s code</a> and for section <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups">8b: Submit patch to Google Groups</a>, use the Google Group above.</p>
 <p>The trunk repository is <code>http://github.com/auser/poolparty</code> for anonymous access.</p>
@@ -86,17 +86,17 @@ cloud spec [name]
 <ul>
 	<li>github: <a href="http://github.com/auser/PoolParty/tree/master">http://github.com/auser/PoolParty/tree/master</a></li>
 </ul>
-<pre>git clone git://github.com/auser/PoolParty.git</pre>
+<pre>git clone git://github.com/auser/poolparty.git</pre>
 <h3>Build and test instructions</h3>
 <p><pre class='syntax'>cd PoolParty
-rake test
+rake spec
 rake install_gem</pre></p>
 <h2>License</h2>
 <p>This code is free to use under the terms of the <span class="caps">MIT</span> license.</p>
 <h2>Contact</h2>
 <p>Comments are welcome. Send an email to <a href="mailto:ari.lerner@citrusbyte.com">Ari Lerner</a> email via the <a href="http://groups.google.com/group/PoolParty">forum</a></p>
     <p class="coda">
-      <a href="http://blog.citrusbyte.com">Ari Lerner</a> at <a href="http://citrusbyte.com">CitrusByte</a>, 14th October 2008<br>
+      <a href="http://blog.citrusbyte.com">Ari Lerner</a> at <a href="http://citrusbyte.com">CitrusByte</a>, 15th October 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -56,7 +56,7 @@ This will create a basic spec for you in the spec directory. Then, write your sp
 
 h2. Forum
 
-"http://groups.google.com/group/PoolParty":http://groups.google.com/group/PoolParty
+"http://groups.google.com/group/PoolPartyRb":http://groups.google.com/group/poolpartyrb
 
 h2. How to submit patches
 
@@ -76,12 +76,12 @@ You can fetch the source from either:
 
 * github: "http://github.com/auser/PoolParty/tree/master":http://github.com/auser/PoolParty/tree/master
 
-<pre>git clone git://github.com/auser/PoolParty.git</pre>
+<pre>git clone git://github.com/auser/poolparty.git</pre>
 
 h3. Build and test instructions
 
 <pre syntax="bash">cd PoolParty
-rake test
+rake spec
 rake install_gem</pre>
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-15 00:00:00 -07:00
+date: 2008-10-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,7 @@ executables:
 - pool-spec
 - pool-start
 - pool-start-monitor
+- server-list-active
 extensions: []
 
 extra_rdoc_files: 
@@ -119,6 +120,7 @@ files:
 - bin/pool-spec
 - bin/pool-start
 - bin/pool-start-monitor
+- bin/server-list-active
 - config/hoe.rb
 - config/requirements.rb
 - examples/basic.rb
@@ -200,13 +202,17 @@ files:
 - lib/poolparty/pool/resources/symlink.rb
 - lib/poolparty/pool/resources/variable.rb
 - lib/poolparty/pool/script.rb
+- lib/poolparty/puppet_plugins/poolparty/plugins/puppet/parser/functions/activenodeips.rb
+- lib/poolparty/puppet_plugins/poolparty/plugins/puppet/parser/functions/activenodenames.rb
 - lib/poolparty/templates/authkeys
 - lib/poolparty/templates/cib.xml
 - lib/poolparty/templates/fileserver.conf
 - lib/poolparty/templates/gem
 - lib/poolparty/templates/ha.cf
 - lib/poolparty/templates/haproxy.conf
+- lib/poolparty/templates/haresources
 - lib/poolparty/templates/namespaceauth.conf
+- lib/poolparty/templates/poolparty.monitor
 - lib/poolparty/templates/puppet.conf
 - lib/poolparty/version.rb
 - lib/poolpartycl.rb
@@ -237,7 +243,6 @@ files:
 - spec/poolparty/modules/definable_resource.rb
 - spec/poolparty/modules/file_writer_spec.rb
 - spec/poolparty/modules/s3_string_spec.rb
-- spec/poolparty/modules/tmp/willy/nilly.rb
 - spec/poolparty/net/remote_bases/ec2_spec.rb
 - spec/poolparty/net/remote_instance_spec.rb
 - spec/poolparty/net/remote_spec.rb