auser-poolparty 1.1.1 → 1.1.3

data/lib/poolparty/provision/boot_strapper.rb

@@ -105,7 +105,7 @@ module PoolParty
           "groupadd -f poolparty",
           # "useradd poolparty  --home-dir /var/poolparty  --groups poolparty  --create-home",
           'cd /var/poolparty/dependencies',
-          "cp /var/poolparty/dependencies/etc/poolparty/gemrc /etc/poolparty",
+          "cp /var/poolparty/dependencies/etc/poolparty/gemrc /etc/poolparty",          
           "#{installer} update",
           "#{installer} install -y ruby1.8 ruby1.8-dev libopenssl-ruby1.8 build-essential wget",  #optional, but nice to have
           "tar -zxvf packages/rubygems-1.3.1.tgz",
@@ -113,6 +113,7 @@ module PoolParty
           "ruby setup.rb --no-ri --no-rdoc",
           "ln -sfv /usr/bin/gem1.8 /usr/bin/gem", #TODO: check if this is really needed
           "cd ../ && rm -rf rubygems-1.3.1*",
+          "gem source --add http://gems.github.com",
           "cd /var/poolparty/dependencies/gems/",
           "gem install --no-rdoc --no-ri -y *.gem",
           "cd /var/poolparty/dependencies",

data/lib/poolparty/resources/file.rb

@@ -4,7 +4,7 @@ module PoolParty
     class File < Resource
       
       def after_create
-        run_erb = dsl_options.include?(:erb) ? dsl_options.delete(:erb) : false
+        run_render = dsl_options.include?(:render_as) ? dsl_options.delete(:render_as) : false
         
         if dsl_options.include?(:template)          
           filename = ::File.expand_path(dsl_options.template)
@@ -13,13 +13,13 @@ module PoolParty
           raise TemplateNotFound.new("no template given") unless file
 
           template_opts = (parent ? options.merge(parent.options) : options)
-          options.merge!(:content => run_erb ? Template.compile_file(filename, template_opts).gsub("\"", "\"") : open(filename).read)
+          options.merge!(:content => run_render ? Template.compile_file(filename, template_opts.merge(:renderer => run_render)).gsub("\"", "\"") : open(filename).read)
         end
         
         if dsl_options.include?(:content)
           cont = dsl_options.delete(:content)
-          template_opts = (parent ? options.merge(parent.options) : options)
-          options.merge!(:content => run_erb ? Template.compile_string(cont, template_opts) : cont)
+          template_opts = (parent ? options.merge(parent.options) : options).merge(:renderer => run_render)
+          options.merge!(:content => run_render ? Template.compile_string(cont, template_opts) : cont)
         end
       end
       

data/spec/poolparty/dependency_resolver/dependency_resolver_cloud_extensions_spec.rb

@@ -96,7 +96,7 @@ describe "Resolution spec" do
           # parent == TestClass
           # puts "<pre>#{parent}</pre> on <pre>#{context_stack.map {|a| a.class }.join(", ")} from #{self.class}</pre>"
           listen "8080"
-          has_file :name => "/etc/apache2/apache2.conf", :template => "/absolute/path/to/template", :friends => "bob"
+          has_file :name => "/etc/apache2/apache2.conf", :template => "/absolute/path/to/template", :friends => "bob", :render_as => :erb
         end
       end
       @cloud = clouds[:dog_for_test]

data/spec/poolparty/net/remote_spec.rb

@@ -184,7 +184,6 @@ describe "Remote" do
         setup
         @tc.stub!(:copy_ssh_app).and_return true
         @tc.stub!(:prepare_reconfiguration).and_return "full"
-        PoolParty::Provisioner.stub!(:reconfigure_master).and_return true
         @tc.stub!(:wait).and_return true
         @tc.stub!(:nonmaster_nonterminated_instances).and_return response_list_of_instances
         @inst = stub_instance(9, "running")

data/spec/poolparty/poolparty/cloud_spec.rb

@@ -313,8 +313,8 @@ describe "Cloud" do
             before(:each) do
               @file = "/etc/puppet/manifests/nodes/nodes.pp"
               @file.stub!(:read).and_return "nodes generate"
-              ::FileTest.stub!(:file?).with("/etc/puppet/manifests/classes/poolparty.pp").and_return true
-              @cloud.stub!(:open).with("/etc/puppet/manifests/classes/poolparty.pp").and_return @file
+              ::FileTest.stub!(:file?).with("/etc/poolparty/poolparty.pp").and_return true
+              @cloud.stub!(:open).with("/etc/poolparty/poolparty.pp").and_return @file
             end
             it "should not call resources_string_from_resources if the file /etc/puppet/manifests/nodes/nodes.pp exists" do
               @cloud.should_not_receive(:add_poolparty_base_requirements)
@@ -325,40 +325,6 @@ describe "Cloud" do
             end
           end
         end
-        describe "minimum_runnable_options" do
-          it "should be an array on the cloud" do
-            @cloud.minimum_runnable_options.class.should == Array
-          end
-          ["keypair","minimum_instances","maximum_instances",
-            "expand_when","contract_when","set_master_ip_to"].each do |k|
-            eval <<-EOE
-              it "should have #{k} in the minimum_runnable_options" do
-                @cloud.minimum_runnable_options.include?(:#{k}).should == true
-              end
-            EOE
-          end
-          it "should include the custom_minimum_runnable_options" do
-            @cloud.stub!(:custom_minimum_runnable_options).and_return [:blank]
-            @cloud.minimum_runnable_options.include?(:blank).should == true
-          end
-        end
-        describe "unique_cookie" do
-          it "should have the method generate generate_unique_cookie_string" do
-            @cloud.respond_to?(:generate_unique_cookie_string).should == true
-          end
-          it "should call hexdigest to digest/sha" do
-            Digest::SHA256.should_receive(:hexdigest).with("#{@cloud.keypair.basename}#{@cloud.name}").and_return "blaaaaah"
-            @cloud.generate_unique_cookie_string
-          end
-          it "should generate the same cookie string every time" do
-            older = @cloud.generate_unique_cookie_string
-            old = @cloud.generate_unique_cookie_string
-            new_one = @cloud.generate_unique_cookie_string
-            older.should == old
-            old.should == new_one
-            new_one.should == older
-          end
-        end
       end
 
       # describe "instances" do

data/spec/poolparty/resources/file_spec.rb

@@ -30,6 +30,7 @@ describe "File" do
             template "/absolute/path/to/template"
             runner "is super fast"
             friends "bob"
+            render_as :erb
           end
         end
         @file = @tc.resource(:file).first

data/test/fixtures/test_template.erb

@@ -0,0 +1 @@
+Hello <%= friends %>

data/test/poolparty/poolparty/template_test.rb

@@ -0,0 +1,31 @@
+require "#{::File.dirname(__FILE__)}/../../test_helper"
+
+class TestDrConfigure < Test::Unit::TestCase
+  context "Rendering of a string" do
+    before do
+      @template_string = "Hello <%= name %>"
+    end
+    it "should have a method called compile_string on the class" do assert Template.respond_to?(:compile_string);end
+    it "should return rendered content" do assert Template.compile_string(@template_string, {:name => "bob"}), "Hello bob" end
+  end
+  context "Rendering of a file" do
+    before do
+      @template_file = ::File.dirname(__FILE__) + "/../../fixtures/test_template.erb"
+    end
+    it "should have a method called compile_file on the class" do assert Template.respond_to?(:compile_file);end
+    it "should return rendered content" do assert Template.compile_file(@template_file, {:friends => "bob"}), "Hello bob" end
+  end
+  context "render_as" do
+    setup do
+      @template_options = {:render_as => :erb}
+    end
+
+    should "should call render with as erb" do
+      assert Template.compile_string("Hi <%= world %>", @template_options.merge(:world => "world")), "Hi world"
+    end
+    should "call render with haml if rendered with haml" do
+      # assert Template.compile_string("Hi <%= world %>", @template_options.merge(:render_as => :haml, :world => "world")), nil
+    end
+  end
+  
+end

data/test/poolparty/provision/boot_strapper_test.rb

@@ -0,0 +1,6 @@
+require "#{::File.dirname(__FILE__)}/../../test_helper"
+
+class TestBootstrapper < Test::Unit::TestCase
+  context "test" do
+  end
+end

data/test/poolparty/provision/dr_configure_test.rb

@@ -0,0 +1,6 @@
+require "#{::File.dirname(__FILE__)}/../../test_helper"
+
+class TestDrConfigure < Test::Unit::TestCase
+  context "test" do
+  end
+end

data/test/test_helper.rb

@@ -1,3 +1,5 @@
 require "rubygems"
+require "test/unit"
 require "context"
+require "shoulda"
 require File.dirname(__FILE__) + '/../lib/PoolParty'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-13 00:00:00 -07:00
+date: 2009-04-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,6 +98,7 @@ executables:
 - cloud-rsync
 - cloud-run
 - cloud-setup-dev
+- cloud-show
 - cloud-spec
 - cloud-ssh
 - cloud-start
@@ -394,17 +395,6 @@ files:
 - lib/poolparty/provision/configurations/chef.rb
 - lib/poolparty/provision/configurations/puppet.rb
 - lib/poolparty/provision/dr_configure.rb
-- lib/poolparty/provisioners
-- lib/poolparty/provisioners/capistrano
-- lib/poolparty/provisioners/capistrano/capistrano.rb
-- lib/poolparty/provisioners/capistrano/capistrano_configurer.rb
-- lib/poolparty/provisioners/capistrano/recipes
-- lib/poolparty/provisioners/capistrano/recipes/aws.rb
-- lib/poolparty/provisioners/capistrano/recipes/base.rb
-- lib/poolparty/provisioners/capistrano/recipes/master.rb
-- lib/poolparty/provisioners/capistrano/recipes/puppet.rb
-- lib/poolparty/provisioners/capistrano/recipes/slave.rb
-- lib/poolparty/provisioners/provisioner_base.rb
 - lib/poolparty/resources
 - lib/poolparty/resources/cron.rb
 - lib/poolparty/resources/custom_service.rb
@@ -576,10 +566,7 @@ files:
 - spec/poolparty/poolparty/test_plugins/webserver.rb
 - spec/poolparty/poolparty_base_class_spec.rb
 - spec/poolparty/poolparty_spec.rb
-- spec/poolparty/provisioners
-- spec/poolparty/provisioners/capistrano
-- spec/poolparty/provisioners/capistrano/capistrano_spec.rb
-- spec/poolparty/provisioners/provisioner_base_spec.rb
+- spec/poolparty/provision
 - spec/poolparty/resources
 - spec/poolparty/resources/cron_spec.rb
 - spec/poolparty/resources/directory_spec.rb
@@ -601,9 +588,16 @@ files:
 - spec/poolparty/spec/core/string_spec.rb
 - spec/poolparty/spec_helper.rb
 - spec/poolparty/test_spec_helper.rb
+- test/fixtures
+- test/fixtures/test_template.erb
 - test/poolparty
 - test/poolparty/core
 - test/poolparty/core/hash_test.rb
+- test/poolparty/poolparty
+- test/poolparty/poolparty/template_test.rb
+- test/poolparty/provision
+- test/poolparty/provision/boot_strapper_test.rb
+- test/poolparty/provision/dr_configure_test.rb
 - test/test_generator_helper.rb
 - test/test_helper.rb
 - test/test_pool_spec_generator.rb
@@ -636,6 +630,7 @@ files:
 - bin/cloud-rsync
 - bin/cloud-run
 - bin/cloud-setup-dev
+- bin/cloud-show
 - bin/cloud-spec
 - bin/cloud-ssh
 - bin/cloud-start

data/lib/poolparty/provisioners/capistrano/capistrano.rb

@@ -1,158 +0,0 @@
-require "poolparty/capistrano"
-
-module PoolParty
-  module Provisioner
-    class Capistrano < ProvisionerBase
-      
-      include ::Capistrano::Configuration::Actions::Invocation
-      
-      def loaded
-        dputs "Capistrano provisioner loaded..."
-        create_config
-      end
-      def process_install!(testing=false)
-        unless testing
-          @cloud.rsync_storage_files_to(@instance)
-          run_capistrano(roles_to_provision, :install)
-        end
-      end
-      def process_configure!(testing=false)
-        unless testing
-          @cloud.rsync_storage_files_to(@instance)
-          run_capistrano(roles_to_provision, :configure)
-        end
-      end
-      
-      def install_tasks
-        provision_master? ? master_install_tasks : slave_install_tasks
-      end
-      def configure_tasks
-        provision_master? ? master_configure_tasks : slave_configure_tasks
-      end
-      def master_install_tasks
-        [
-          "custom_install_tasks",
-          "master_provision_master_task",
-          "after_install_tasks",
-          "custom_configure_tasks",
-          "before_configuration_tasks",
-          "master_configure_master_task",
-          "run_provisioner_twice"
-        ]#.map {|a| a.to_sym }
-      end
-      def master_configure_tasks
-        [
-          "before_configuration_tasks",
-          "master_configure_master_task"
-        ]#.map {|a| a.to_sym }
-      end
-      
-      def slave_install_tasks
-        [
-          "custom_install_tasks",
-          "slave_provision_slave_task",
-          "after_install_tasks",
-          "custom_configure_tasks",
-          "slave_configure_slave_task"
-        ]
-      end
-      def slave_configure_tasks
-        [
-          "custom_configure_tasks",
-          "slave_configure_slave_task"
-        ]#.flatten.map {|a| a.to_sym }
-      end
-            
-      def set_poolparty_roles
-        return "" if testing
-        returning Array.new do |arr|
-          arr << "role 'master.#{cloud.name}'.to_sym, '#{cloud.ip}'"
-          arr << "role :master, '#{cloud.ip}'"
-          arr << "role :slaves, '#{cloud.nonmaster_nonterminated_instances.map{|a| a.ip}.join('", "')}'" if cloud.nonmaster_nonterminated_instances.size > 0
-          arr << "role :single, '#{@instance.ip}'" if @instance && @instance.ip
-        end.join("\n")
-      end
-      
-      def parent
-        @cloud
-      end
-      
-      # Create the config for capistrano
-      # This is a dynamic capistrano configuration file
-      def create_config
-        @config = ::Capistrano::Configuration.new
-        if @cloud.debug || @cloud.verbose 
-          @config.logger.level = @cloud.debug ? ::Capistrano::Logger::MAX_LEVEL : ::Capistrano::Logger::INFO
-        else
-          @config.logger.level = ::Capistrano::Logger::IMPORTANT
-        end
-        
-        capfile = returning Array.new do |arr|
-          Dir["#{::File.dirname(__FILE__)}/recipes/*.rb"].each {|a| arr << "require '#{a}'" }
-          arr << "ssh_options[:keys] = '#{parent.keypair}'"
-          
-          arr << set_poolparty_roles
-        end.join("\n")
-        
-        @config.provisioner = self
-        @config.cloud = @cloud
-        
-        @config.load(:string => capfile)
-        
-        @cloud.deploy_file? ? @config.load(@cloud.deploy_file) : @config.set(:user, @cloud.user)
-      end
-      
-      # Prerun
-      def prerun_setup
-      end
-      
-      # In run_capistrano, we are going to run the entire capistrano process
-      # First, 
-      def run_capistrano(roles = [:master], meth = :install)
-        prerun_setup
-        commands = (meth == :install ? install_tasks : configure_tasks)
-        name = "#{roles.first}_provisioner_#{meth}"
-
-        __define_task(name, roles) do
-          commands.map do |command|
-            puts "executing task #{command}"
-            task = find_task(command.to_sym)
-            if task
-              task.options.merge!(:roles => roles)
-              execute_task task
-            else
-              if provisioner.respond_to?(command.to_sym)
-                cmd = provisioner.send(command.to_sym)
-                cmd = cmd.join(" && ") if cmd.is_a?(Array)
-                run(cmd)
-              else
-                self.send(command.to_sym)
-              end
-            end
-          end
-        end
-                
-        begin
-          __run(name)
-          return true
-        rescue ::Capistrano::CommandError => e
-          return false unless verbose
-          puts "Error: #{e} " and raise ProvisionerException.new("Error: #{e}")
-        end
-      end
-                  
-      def __define_task(name, roles, &block)
-        @config.task __task_sym(name), :roles => roles, &block
-      end
-
-      def __run(task)
-        @config.send __task_sym(task)
-      end
-
-      def __task_sym(name)
-        "#{name.to_s.downcase.underscore}".to_sym
-      end
-      
-    end
-  end
-end

data/lib/poolparty/provisioners/capistrano/capistrano_configurer.rb

@@ -1,69 +0,0 @@
-=begin rdoc
-  This overwriting of the Capistrano method missing allows our capistrano
-  tasks to have access to the methods on the provisioner and options
-  set on the clouds. This saves us the responsibility of setting variables
-  in the dynamic cap file.
-=end
-#TODO# Clean up
-module Capistrano
-  class Configuration
-    attr_accessor :cloud, :provisioner
-
-    def method_missing_without_variables(sym, *args, &block)
-      if parent.respond_to?(sym)
-        parent.send(sym, *args, &block)
-      elsif provisioner.respond_to?(sym)
-        provisioner.send(sym, *args, &block)
-      elsif cloud.respond_to?(sym)
-        cloud.send(sym, *args, &block)
-      elsif PoolParty::Default.options.has_key?(sym)
-        PoolParty::Default.options[sym]
-      elsif PoolParty::Default.respond_to?(sym)
-        PoolParty::Default.send(sym, *args, &block)
-      else
-        super
-      end
-    end
-      
-    
-    module Namespaces            
-      class Namespace        
-        
-        def provisioner
-          parent.provisioner
-        end
-        
-        def cloud(name=nil)
-          puts "name: #{name}"
-          name ? PoolParty::Cloud.clouds[name] : parent.cloud
-        end
-        
-        def parent
-          cloud 
-        end
-        
-        def method_missing(sym, *args, &block)
-          # if parent
-          #   parent.send(sym, *args, &block) rescue super
-          # else
-          #   super
-          # end
-          if parent.respond_to?(sym)
-            parent.send(sym, *args, &block)
-          elsif provisioner.respond_to?(sym)
-            provisioner.send(sym, *args, &block)
-          elsif cloud.respond_to?(sym)
-            cloud.send(sym, *args, &block)
-          elsif PoolParty::Default.options.has_key?(sym)
-            PoolParty::Default.options[sym]
-          elsif PoolParty::Default.respond_to?(sym)
-            PoolParty::Default.send(sym, *args, &block)
-          else
-            super
-          end
-
-        end
-      end
-    end    
-  end
-end

data/lib/poolparty/provisioners/capistrano/recipes/aws.rb

@@ -1,21 +0,0 @@
-Capistrano::Configuration.instance(:must_exist).load do
-
-  desc "FIXME: temporary, ec2 specific hack untill server binaries are refactored"
-  def copy_ec2_poolparty_server_binaries
-    upload( "#{::File.dirname(__FILE__)}/../../../../../bin/ec2-list-active", '/usr/bin/server-list-active', :mode=>755)
-    # Dir["#{::File.dirname(__FILE__)}/../../../../../bin/*"].each{ |f|
-    #   put f, '/usr'}      
-  end
-  
-  desc "Put poolparty keys"
-  def put_poolparty_keys
-    put keypair.full_filepath, remote_keypair_path, :mode => 600
-  end
-  
-  desc "place the aws keys on the server at /etc/poolparty/aws_keys"
-  def put_aws_credintials_on_server
-    aws_keys={:access_key => access_key, :secret_access_key => secret_access_key}
-    put aws_keys.to_yaml, '/etc/poolparty/aws_keys.yml', :mode => 400
-  end
-  
-end

data/lib/poolparty/provisioners/capistrano/recipes/base.rb

@@ -1,164 +0,0 @@
-=begin rdoc
-  Base provisioner capistrano tasks
-=end
-
-# Run each of these methods inside the Capistrano:Configuration context, dynamicly adding each method as a capistrano task.
-Capistrano::Configuration.instance(:must_exist).load do
-  
-  # namespace(:base) do
-  desc "Install ruby"
-  def install_ruby_from_stable_source
-    # Not sure which is the appropriate step to take yet... install from source or using a package manager... 
-    # We'll stick with the package manager for now
-    run "#{installer_for} ruby"
-    # run <<-EOR
-    #   cd #{remote_storage_path}/dependencies.tar/packages/
-    #   tar -zxf stable-snapshot.tar.gz
-    #   cd ruby
-    #   ./configure
-    #   make
-    #   make install
-    # EOR
-  end
-    desc "Install rubygems"
-    def install_rubygems_from_stable_source
-      # run "#{installer_for} ruby rubygems"
-      run <<-EOR
-        cd #{remote_storage_path}/dependencies.tar/packages/
-        tar -zxf rubygems
-        cd rubygems-1.3.1
-        ruby setup.rb
-      EOR
-    end
-    
-    desc "Setup for poolparty"
-    def setup_for_poolparty
-      run "mkdir -p #{Default.base_config_directory}"
-      put cloud.to_properties_hash.to_json, "/etc/poolparty/clouds.json"
-      upload $pool_specfile, "#{Default.base_config_directory}/clouds.rb"
-    end
-    
-    desc "Install provisioner"
-    def install_provisioner
-      run "#{installer_for} #{puppet_packages}"
-    end
-    
-    desc "Create poolparty commands"
-    def create_poolparty_commands
-    end
-
-    desc "Fix rubygems"
-    def fix_rubygems
-      # echo '#{open(::File.join(template_directory, "gem")).read}' > /usr/bin/gem &&
-      # cp #{remote_storage_path}/gem /usr/bin/gem
-      run <<-EOR
-        if gem -v; then echo "gem is working"; else cp #{remote_storage_path}/gem /usr/bin/gem; fi;
-        /usr/bin/gem update --system 2>&1 > /dev/null;/usr/bin/gem update --system
-        GEMPATH=`gem env gempath`
-        cp  $GEMPATH/bin/* /usr/bin;
-        if gem -v; then echo "gem is working"; else cp #{remote_storage_path}/gem /usr/bin/gem; fi;
-        echo 'gems updated!'
-      EOR
-    end
-    
-    desc "Unpack dependency store"
-    def unpack_dependencies_store
-      "tar -zxf #{remote_storage_path}/dependencies.tar.gz"
-    end
-    
-    desc "Install base gems"
-    def install_base_gems
-      # run(returning(Array.new) do |arr|
-      #   base_gems.each do |name, url|
-      #     str = url.empty? ? "#{name}" : "#{Base.remote_storage_path}/#{name}.gem"
-      #     arr << "/usr/bin/gem install --ignore-dependencies --no-ri --no-rdoc #{str}; echo 'insatlled #{name}'"
-      #   end
-      # end.join(" && "))
-      run <<-EOR
-        ruby -e 'Dir["#{remote_storage_path}/gems/cache/*.gem"].each {|g| `/usr/bin/gem install --ignore-dependencies --no-ri --no-rdoc \#\{g\}` }'
-      EOR
-    end
-    
-    desc "Upgrade system"
-    def upgrade_system
-      str = case os
-      when :ubuntu
-        "
-echo 'deb http://mirrors.kernel.org/ubuntu hardy main universe' >> /etc/apt/sources.list &&
-aptitude update -y
-        "
-      else
-        "echo 'No system upgrade needed'"
-      end
-      run str
-    end
-    
-    # DEPRECATE
-    desc "Upgrade rubygems"
-    def upgrade_rubygems
-      
-    end
-    
-    desc "Make log directory"
-    def make_log_directory
-      run "mkdir -p /var/log/poolparty"
-    end
-    
-    desc "Create ssl storage directories for poolparty"
-    def create_poolparty_ssl_store
-      run <<-EOR
-        mkdir -p #{poolparty_config_directory}/ssl/private_keys &&
-        mkdir -p #{poolparty_config_directory}/ssl/certs &&
-        mkdir -p #{poolparty_config_directory}/ssl/public_keys
-      EOR
-    end
-    desc "Add erlang cookie"
-    def write_erlang_cookie
-      # cookie = (1..16).collect { chars[rand(chars.size)] }.pack("C*")
-      cookie =  (1..65).collect {rand(9)}.join()
-      put( cookie, '/root/.erlang.cookie', :mode => 400 )
-    end
-    
-    desc "Setup basic poolparty structure"
-    def setup_basic_poolparty_structure
-      run <<-EOR
-        echo "Creating basic structure for poolparty" &&
-        mkdir -p /etc/puppet/manifests/nodes  &&
-        mkdir -p /etc/puppet/manifests/classes &&
-        echo "import 'nodes/*.pp'" > /etc/puppet/manifests/site.pp &&
-        echo "import 'classes/*.pp'" >> /etc/puppet/manifests/site.pp          
-      EOR
-    end
-    
-    desc "Setup shareable file system for provisioner"
-    def setup_provisioner_filestore
-      run <<-EOR
-        echo '[files]' > /etc/puppet/fileserver.conf &&
-        echo '  path #{remote_storage_path}' >> /etc/puppet/fileserver.conf &&
-        echo '  allow *' >> /etc/puppet/fileserver.conf &&
-        mkdir -p /var/poolparty/facts &&
-        mkdir -p /var/poolparty/files &&
-        mkdir -p #{base_config_directory}
-      EOR
-    end
-    
-    desc "Setup autosigning for provisioner"
-    def setup_provisioner_autosigning
-      run "echo \"*\" > /etc/puppet/autosign.conf"
-    end
-    
-    desc "ensure gem binaries are copied to /usr/bin/"
-    def copy_gem_bins_to_usr_bin
-      run 'cp /usr/lib/ruby/gems/1.8/gems/*/bin/* /usr/bin'
-    end
-
-    
-    desc "ensure gem binaries are copied to /usr/bin/"
-    def copy_gem_bins_to_usr_bin
-      run 'GEMPATH=`gem env gempath` && cp $GEMPATH/bin/* /usr/bin/'
-      run 'ls /usr/bin/|grep server'
-      run 'echo ---------   binaries copied  ---------\n\n'
-    end
-    
-  # end
-end