auser-poolparty 0.2.9 → 0.2.15

data/lib/poolparty/core/hash.rb

@@ -12,14 +12,28 @@ class Hash
     o.keys.each {|k| self.delete(k) }
     o
   end
+  def append(other_hash)
+    returning Hash.new do |h|
+      h.merge!(self)
+      other_hash.each do |k,v|
+        h[k] = has_key?(k) ? [self[k], v].flatten : v
+      end
+    end
+  end
+  def append!(other_hash)
+    other_hash.each do |k,v|
+      self[k] = has_key?(k) ? [self[k], v].flatten : v
+    end
+    self
+  end
   def safe_merge(other_hash)
     merge(other_hash.delete_if {|k,v| has_key?(k) })
   end
   def safe_merge!(other_hash)
     merge!(other_hash.delete_if {|k,v| has_key?(k) && !v.nil? })
   end
-  def flush_out(prev="", post="")
-    map {|k,v| "#{prev}#{k} => #{v.to_option_string}#{post}"}
+  def flush_out(pre="", post="")
+    map {|k,v| "#{pre}#{k} => #{v.to_option_string}#{post}"}
   end
   def to_os
     m={}

data/lib/poolparty/core/string.rb

@@ -25,7 +25,7 @@ class String
     self.split("::")[-1].downcase rescue self
   end
   def sanitize
-    self.gsub(/[\.]*/, '')
+    self.gsub(/[\.\/]*/, '')
   end
   def nice_runnable(quite=true)
     self.split(/ && /).join("\n")

data/lib/poolparty/core/symbol.rb

@@ -1,6 +1,6 @@
 class Symbol
-  def to_string(prev="")
-    "#{prev}#{self.to_s}"
+  def to_string(pre="")
+    "#{pre}#{self.to_s}"
   end
   def sanitize
     self.to_s.sanitize

data/lib/poolparty/dependency_resolutions/base.rb

@@ -0,0 +1,12 @@
+module PoolParty
+  module DependencyResolutions
+    module Base
+      
+      def to_s
+      end
+      def to_string        
+      end
+      
+    end
+  end
+end

data/lib/poolparty/dependency_resolutions/puppet.rb

@@ -0,0 +1,49 @@
+module PoolParty
+  module DependencyResolutions
+    module Puppet
+      
+      def pretty_print_resources(pre=" ")
+        returning Array.new do |out|
+          resources.each do |name, res|
+            out << "#{pre}#{name}"
+            out << "#{pre*2}#{res.map {|a| a.name}}"
+            res.each do |r|
+              out << "#{pre*2}#{r.pretty_print_resources(pre*2)}"
+            end
+          end
+        end.join("\n")
+      end
+      
+      # Generic to_s
+      # Most Resources won't need to extend this
+      def to_string(pre="")
+        opts = get_modified_options
+        returning Array.new do |output|
+          unless cancelled?
+            output << @prestring || ""
+          
+            if resources && !resources.empty?
+              @cp = classpackage_with_self(self)
+              output << @cp.to_string
+              output << "include #{@cp.name.sanitize}"
+            end
+            
+            unless virtual_resource?
+              output << "#{pre}#{class_type_name.downcase} {"
+              output << "#{pre}\"#{self.key}\":"
+              output << opts.flush_out("#{pre*2}").join(",\n")
+              output << "#{pre}}"            
+            end
+          
+            output << @poststring || ""
+          end
+        end.join("\n")
+      end
+      
+      def to_s
+        "#{class_type_name.capitalize}['#{key}']"
+      end
+      
+    end
+  end
+end

data/lib/poolparty/helpers/display.rb

@@ -7,10 +7,10 @@ module PoolParty
           print v.pretty_print
         end
       else
-        prev = "\t"
+        pre = "\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")
+          puts cl.pretty_name(pre*2, cl)
+          puts cl.pretty_options(pre*2, cl) #cl.pretty_print("#{pre}\t")
         end
       end
 

data/lib/poolparty/helpers/provisioner_base.rb

@@ -17,7 +17,7 @@ module PoolParty
     end
 
     def self.provision_slaves(cloud, testing=false)
-      cloud.nonmaster_nonterminated_instances.each do |sl|
+      cloud.nonmaster_nonterminated_instances.each do |sl|        
         provision_slave(sl, cloud, testing)
       end
     end
@@ -53,7 +53,7 @@ module PoolParty
         loaded
       end
       # Callback after initialized
-      def loaded      
+      def loaded(opts={}, parent=self)      
       end
       # This is the actual runner for the installation    
       def install
@@ -71,10 +71,11 @@ module PoolParty
         setup_runner(@cloud)
         
         unless testing
-          puts "Logging on to #{@instance.ip}"
+          logger.debug "Logging on to #{@instance.ip}"
+          @cloud.prepare_reconfiguration
           @cloud.rsync_storage_files_to(@instance)
           
-          cmd = "cd #{Base.remote_storage_path}/#{Base.tmp_path} && chmod +x install_#{name}.sh && /bin/sh install_#{name}.sh && rm install_#{name}.sh"
+          cmd = "cd #{Base.remote_storage_path} && chmod +x install_#{name}.sh && /bin/sh install_#{name}.sh && rm install_#{name}.sh"
           hide_output do
             @cloud.run_command_on(cmd, @instance)
           end          
@@ -96,7 +97,7 @@ module PoolParty
         unless testing
           @cloud.rsync_storage_files_to(@instance)
 
-          cmd = "cd #{Base.remote_storage_path}/#{Base.tmp_path} && chmod +x configure_#{name}.sh && /bin/sh configure_#{name}.sh && rm configure_#{name}.sh"
+          cmd = "cd #{Base.remote_storage_path} && chmod +x configure_#{name}.sh && /bin/sh configure_#{name}.sh && rm configure_#{name}.sh"
           @cloud.run_command_on(cmd, @instance)
         end
       end
@@ -230,7 +231,6 @@ module PoolParty
           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"

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

@@ -29,10 +29,9 @@ module PoolParty
 
       def configure_tasks
         [
-          start_puppetmaster,
+          # start_puppetmaster,
           create_local_node,
           move_templates,
-          move_plugins,
           create_poolparty_manifest,
           restart_puppetd
         ]
@@ -53,7 +52,7 @@ echo "import 'nodes/*.pp'" > /etc/puppet/manifests/site.pp
 echo "import 'classes/*.pp'" >> /etc/puppet/manifests/site.pp
 mkdir -p /etc/puppet/manifests/nodes 
 mkdir -p /etc/puppet/manifests/classes
-cp #{Base.remote_storage_path}/#{Base.tmp_path}/namespaceauth.conf /etc/puppet/namespaceauth.conf
+cp #{Base.remote_storage_path}/namespaceauth.conf /etc/puppet/namespaceauth.conf
         EOS
       end
 
@@ -67,7 +66,7 @@ echo "#{open(File.join(template_directory, "puppet.conf")).read}" > /etc/puppet/
         <<-EOS
 echo "
 [files]
-  path #{Base.remote_storage_path}/#{Base.tmp_path}
+  path #{Base.remote_storage_path}
   allow *" > /etc/puppet/fileserver.conf
 mkdir -p /var/poolparty/facts
 mkdir -p /var/poolparty/files
@@ -102,35 +101,36 @@ 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
-cp #{Base.remote_storage_path}/#{Base.tmp_path}/poolparty.pp /etc/puppet/manifests/classes/poolparty.pp
-cp #{Base.remote_storage_path}/#{Base.tmp_path}/#{Base.key_file_locations.first} "#{Base.base_config_directory}/.ppkeys"
-cp #{Base.remote_storage_path}/#{Base.tmp_path}/#{Base.default_specfile_name} #{Base.base_config_directory}/#{Base.default_specfile_name}
-cp #{Base.remote_storage_path}/#{Base.tmp_path}/#{@cloud.full_keypair_name} #{@cloud.remote_keypair_path}
+cp #{Base.remote_storage_path}/poolparty.pp /etc/puppet/manifests/classes/poolparty.pp
+cp #{Base.remote_storage_path}/#{Base.key_file_locations.first} "#{Base.base_config_directory}/.ppkeys"
+cp #{Base.remote_storage_path}/#{Base.default_specfile_name} #{Base.base_config_directory}/#{Base.default_specfile_name}
+#{copy_ssh_app}
         EOS
       end
+      
+      def copy_ssh_app
+        if @cloud.remote_keypair_path != "#{Base.remote_storage_path}/#{@cloud.full_keypair_name}"
+          "cp #{Base.remote_storage_path}/#{@cloud.full_keypair_name} #{@cloud.remote_keypair_path}"
+        end
+      end
 
+      # ps aux | grep puppetmasterd | awk '{print $2}' | xargs kill
+      # rm -rf /etc/puppet/ssl
+      # puppetmasterd --verbose
       def start_puppetmaster
         <<-EOS
-ps aux | grep puppetmasterd | awk '{print $2}' | xargs kill
-rm -rf /etc/puppet/ssl
-puppetmasterd --verbose
         EOS
       end
 
+      # puppetd --listen --fqdn #{@instance.name}
       def restart_puppetd
         <<-EOS
-          puppetd --listen --fqdn #{@instance.name}
+          killall ruby
+          rm -rf /etc/puppet/ssl/*
+          puppetmasterd --verbose
+          . /etc/profile && #{@instance.puppet_runner_command}
         EOS
       end
     end

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

@@ -18,7 +18,7 @@ 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
-          cp #{Base.remote_storage_path}/#{Base.tmp_path}/namespaceauth.conf /etc/puppet/namespaceauth.conf
+          cp #{Base.remote_storage_path}/namespaceauth.conf /etc/puppet/namespaceauth.conf
         EOE
       end
 
@@ -28,10 +28,11 @@ module PoolParty
         EOS
       end
 
+      # /etc/init.d/puppetmasterd stop
+      # puppetd --listen --fqdn #{@instance.name}
       def start_puppet
         <<-EOS
-/etc/init.d/puppetmasterd stop
-puppetd --listen --fqdn #{@instance.name}
+          rm -rf /etc/puppet/ssl*
         EOS
       end
       

data/lib/poolparty/modules/definable_resource.rb

@@ -52,6 +52,7 @@ module PoolParty
       klass = "PoolParty::Resources::#{symc}".constantize
       klass.module_eval &block if block
       klass.send :define_method, :virtual_resource?, Proc.new{true}
+      klass.send :define_method, :printable?, Proc.new{false}
       klass
     end
     

data/lib/poolparty/modules/file_writer.rb

@@ -1,26 +1,21 @@
 module PoolParty
   module FileWriter
-    def copy_file_to_storage_directory(file)
+    def copy_file_to_storage_directory(file, preceded="")
       make_base_directory
-      path = ::File.join( Base.storage_directory, ::File.basename(file) )
-      FileUtils.cp file, path
+      path = ::File.join( Base.storage_directory, preceded, ::File.basename(file) )      
+      FileUtils.cp file, path unless file == path || ::File.exists?(path)
     end
     def copy_template_to_storage_directory(file)
       make_template_directory
-      path = ::File.join( Base.template_directory, ::File.basename(file) )
-      FileUtils.cp file, path
+      path = ::File.join( Base.tmp_path, Base.template_directory, ::File.basename(file) )
+      FileUtils.cp file, path unless file == path || ::File.exists?(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) )
+    def write_to_file_in_storage_directory(file, str, preceded="", &block)
+      path = ::File.join( Base.storage_directory, preceded, ::File.basename(file) )
       write_to_file(path, str, &block)
     end
-    def write_to_file(file, str, &block)
-      path = ::File.join( Base.storage_directory, ::File.basename(file) )
+    def write_to_file(file, str, preceded="", &block)
+      path = ::File.join( Base.storage_directory, preceded, ::File.basename(file) )
       make_base_path( Base.storage_directory )
       ::File.open(path, "w+") do |f|
         f.print str
@@ -51,10 +46,8 @@ module PoolParty
       FileUtils.mkdir_p Base.storage_directory unless ::File.directory?(Base.storage_directory)
     end
     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)
+      path = ::File.join(Base.tmp_path, Base.template_directory)
+      FileUtils.mkdir_p path unless ::File.directory?(path)
     end
     def clear_base_directory
       FileUtils::rm_rf "#{Base.storage_directory}"

data/lib/poolparty/modules/method_missing_sugar.rb

@@ -42,7 +42,7 @@ module PoolParty
         if options.has_key?(m)
           options[m]
         else
-          (parent.nil? || parent.class == self.class || !parent.respond_to?(:options)) ? nil : parent.send(m, *args, &block)
+          (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]

data/lib/poolparty/modules/pretty_printer.rb

@@ -1,20 +1,20 @@
 module PoolParty
   module PrettyPrinter
     
-    def pretty_print(prev="\t")
+    def pretty_print(pre="\t")
       returning Array.new do |out|
-        out << pretty_name(prev, self)
-        out << pretty_options(prev, self)
+        out << pretty_name(pre, self)
+        out << pretty_options(pre, self)
         
         if self.respond_to?(:clouds)
           clouds.each do |name, cl|
-            out << pretty_name(prev*2, cl)
-            out << pretty_options(prev*2, cl) #cl.pretty_print("#{prev}\t")
+            out << pretty_name(pre*2, cl)
+            out << pretty_options(pre*2, cl) #cl.pretty_print("#{pre}\t")
           end
         end
         if self.respond_to?(:plugins)
-          out << "#{prev}\t\tPlugins"
-          out << "#{prev}\t\t" + plugins.map {|a| a}.join("\n")
+          out << "#{pre}\t\tPlugins"
+          out << "#{pre}\t\t" + plugins.map {|a| a}.join("\n")
         end
       end.join("\n")
     end
@@ -22,17 +22,17 @@ module PoolParty
     # Gather options on the object
     # Do not print if the option is nil or empty.
     # Also, don't show the option if the option is empty or the default option on the cloud    
-    def pretty_options(prev, o)
+    def pretty_options(pre, o)
       return "" unless o.respond_to?(:options)
       print_options = (o.respond_to?(:parent) && o.parent && o.parent.respond_to?(:options)) ? 
         (o.options.delete_if {|k,v| o.parent.options.has_key?(k) && o.parent.options[k] == o.options[k] && !o.options[k].nil? } ) : 
         o.options
       print_options = print_options.map {|k,v| [k, o.send(k.to_sym).to_s] }.inject({}) { |r,e| r[e[0]] = e[1] unless o.class.default_options[e[0]] == e[1] || e[1].nil? || e[1].empty?; r }
-      print_options.flush_out("#{prev}\t")
+      print_options.flush_out("#{pre}\t")
     end
     
-    def pretty_name(prev, o)
-      "#{prev}#{o.class.to_s.top_level_class.capitalize}: #{o.name if o.respond_to?(:name)}"
+    def pretty_name(pre, o)
+      "#{pre}#{o.class.to_s.top_level_class.capitalize}: #{o.name if o.respond_to?(:name)}"
     end
     
   end

data/lib/poolparty/modules/resourcing_dsl.rb

@@ -0,0 +1,57 @@
+module PoolParty
+  module ResourcingDsl
+    # Overrides for syntax
+    # Allows us to send require to require a resource
+    def require(str="")
+      str ? options.merge!(:require => str) : options[:require]
+    end
+    def requires(str=nil)
+      str ? options.append!(:require => str) : options[:require]
+    end 
+    def ensures(str="running")
+      if %w(absent running).map {|a| self.send a.to_sym}.include?(str)
+        str == "absent" ? is_absent : is_present
+      else
+        options.append!(:ensure => str)
+      end
+      str
+    end
+    # Allows us to send an ensure to ensure the presence of a resource
+    def is_present(*args)
+      options.merge!(:ensure => present)
+    end
+    # Ensures that what we are sending is absent
+    def is_absent(*args)
+      options.merge!(:ensure => absent)
+    end
+    # Alias for unless
+    def ifnot(str="")
+      options.merge!(:unless => str)
+    end
+    def present
+      "present"
+    end
+    def absent
+      "absent"
+    end
+    def cancel(*args)
+      options[:cancelled] = args.empty? ? true : args[0]
+    end
+    def cancelled?
+      options[:cancelled] || false
+    end
+    # Give us a template to work with on the resource
+    # Make sure this template is moved to the tmp directory as well
+    def template(file, opts={})
+      raise TemplateNotFound.new("no template given") unless file
+      raise TemplateNotFound.new("template cannot be found #{file}") unless ::File.file?(file)
+      unless opts[:just_copy]          
+        options.merge!({:content => "template(\"#{::File.basename(file)}\")"})
+        options.delete(:source) if options.has_key?(:source)
+        copy_template_to_storage_directory(file)
+      else
+        copy_file_to_storage_directory(file)
+      end
+    end
+  end
+end