auser-poolparty 0.2.81 → 0.2.84

data/spec/poolparty/net/remote_spec.rb

@@ -13,6 +13,8 @@ end
 
 describe "Remote" do
   before(:each) do
+    @cloud = cloud :test_cloud do;end
+    
     @tc = TestClass.new
     @tc.stub!(:verbose).and_return false
     setup
@@ -207,13 +209,21 @@ describe "Remote" do
         before(:each) do
           setup
           stub_list_from_remote_for(@tc)
-          @tc.stub!(:request_launch_new_instances).and_return PoolParty::Remote::RemoteInstance.new(:ip => "127.0.0.1", :num => 1)
+          @ri = PoolParty::Remote::RemoteInstance.new(:ip => "127.0.0.1", :num => 1, :name => "master")
+          @tc.stub!(:request_launch_new_instances).and_return @ri
           @tc.stub!(:can_start_a_new_instance).and_return true
           @tc.stub!(:list_of_pending_instances).and_return []
           @tc.stub!(:prepare_for_configuration).and_return true
           @tc.stub!(:build_and_store_new_config_file).and_return true          
           PoolParty::Provisioner.stub!(:provision_slaves).and_return true
-          Kernel.stub!(:system).and_return true
+          @cloud.stub!(:master).and_return @ri
+          @cloud.stub!(:list_of_nonterminated_instances).and_return [@ri]
+          @cloud.stub!(:full_keypair_path).and_return "keyairs"
+          
+          @provisioner = PoolParty::Provisioner::Capistrano.new(@ri, @cloud, :ubuntu)
+          PoolParty::Provisioner::Capistrano.stub!(:new).and_return @provisioner
+          @provisioner.stub!(:install).and_return true
+          @provisioner.stub!(:configure).and_return true
         end
         it "should receive can_start_a_new_instance?" do
           @tc.should_receive(:can_start_a_new_instance?).once
@@ -227,12 +237,7 @@ describe "Remote" do
         end
         it "should call a new slave provisioner" do
           @tc.stub!(:should_expand_cloud?).once.and_return true
-          PoolParty::Provisioner.should_receive(:provision_slave).at_least(1)
-          # Kernel.should_receive(:system).with(". /etc/profile && cloud-provision -i 5 2>&1 > /dev/null &").and_return true
-        end
-        it "should call reconfigure on the master to pick up the new slave" do
-          @tc.stub!(:should_expand_cloud?).once.and_return true
-          PoolParty::Provisioner.should_receive(:reconfigure_master).once
+          @provisioner.should_receive(:install).at_least(1)
         end
         after(:each) do
           @tc.expand_cloud_if_necessary
@@ -269,12 +274,6 @@ describe "Remote" do
         @obj = Object.new
         @obj.stub!(:ip).and_return "192.168.0.1"
       end
-      it "should raise an exception if it cannot find the keypair" do
-        @tc.stub!(:keypair_path).and_return nil
-        lambda {
-          @tc.rsync_storage_files_to(@tc.master)
-        }.should raise_error
-      end
       it "should call exec on the kernel" do
         @tc.stub!(:keypair).and_return "funky"
         ::File.stub!(:exists?).with("#{File.expand_path(Base.base_keypair_path)}/id_rsa-funky").and_return true

data/spec/poolparty/net/remoter_spec.rb

@@ -11,7 +11,7 @@ describe "Remoter" do
   end
   describe "ssh_string" do
     it "should have the ssh command" do
-      @tc.ssh_string.should =~ /ssh -o StrictHostKeyChecking=no -l '#{Base.user}' -i/
+      @tc.ssh_string.should =~ /ssh -o StrictHostKeyChecking=no -l/
     end
     it "should have the keypair in the ssh_string" do
       @tc.ssh_string.should =~ /#{@tc.keypair}/
@@ -21,9 +21,6 @@ describe "Remoter" do
     it "should have StrictHostKeyChecking set to no" do
       @tc.ssh_array.include?("-o StrictHostKeyChecking=no").should == true
     end
-    it "should have the user set to the base user class" do
-      @tc.ssh_array.include?("-l '#{Base.user}'").should == true
-    end
     it "should have the keypair path in the ssh_array" do
       @tc.ssh_array.include?('-i "'+@tc.full_keypair_path+'"').should == true
     end
@@ -34,7 +31,7 @@ describe "Remoter" do
       @ri.stub!(:ip).and_return "192.168.0.22"
     end
     it "should have rsync in the rsync_command" do
-      @tc.rsync_command.should == "rsync -azP --exclude cache -e '#{@tc.ssh_string}'"
+      @tc.rsync_command.should == "rsync -azP --exclude cache -e '#{@tc.ssh_string} -l #{Base.user}'"
     end
     it "should be able to rsync storage commands" do
       @tc.rsync_storage_files_to_command(@ri).should == "#{@tc.rsync_command} #{Base.storage_directory}/ 192.168.0.22:/var/poolparty"
@@ -44,6 +41,7 @@ describe "Remoter" do
     before(:each) do
       @tc.stub!(:wait).and_return true
       stub_list_from_remote_for(@tc)
+      stub_remoting_methods_for(@tc)
       @tc.stub!(:maximum_instances).and_return 5
       @tc.stub!(:list_of_pending_instances).and_return []
       @tc.stub!(:list_of_nonterminated_instances).and_return []
@@ -51,9 +49,14 @@ describe "Remoter" do
       @tc.stub!(:master).and_return ris.first
       @tc.stub!(:after_launched).and_return true
       @tc.stub!(:verbose).and_return false
-      Provisioner.stub!(:provision_master).and_return true
-      Provisioner.stub!(:reconfigure_master).and_return true
-      Provisioner.stub!(:clear_master_ssl_certs).and_return true
+      ::File.stub!(:exists?).and_return true
+      
+      @pb = PoolParty::Provisioner::Capistrano.new(nil, @tc)
+      PoolParty::Provisioner::Capistrano.stub!(:new).and_return @pb
+      @pb.stub!(:setup_runner)
+      @pb.stub!(:install).and_return true
+      @pb.stub!(:configure).and_return true
+      @pb.stub!(:create_roles).and_return true
     end
     it "should have the method launch_master!" do
       @tc.respond_to?(:launch_and_configure_master!).should == true
@@ -69,9 +72,6 @@ describe "Remoter" do
       @tc.stub!(:can_start_a_new_instance?).and_return true
       @tc.stub!(:is_master_running?).and_return false
     end
-    it "should tell the provisioner to provision_master" do
-      Provisioner.should_receive(:provision_master).once.and_return true
-    end
     after(:each) do
       @tc.launch_and_configure_master!
     end

data/spec/poolparty/plugins/git_spec.rb

@@ -21,7 +21,7 @@ describe "Remote Instance" do
       @tc.has_git(:at => "/var/www/", :name => "gitrepos.git", :source => "git://source.git").to_string.should =~ /exec/
     end
     it "should included the flushed out options" do
-      @tc.has_git({:name => "git.git", :source => "git://source.git", :user => "finger", :at => "/var/www/"}).to_string.should =~ /finger@git:/
+      @tc.has_git({:name => "git.git", :source => "git://source.git", :requires_user => "finger", :at => "/var/www/"}).to_string.should =~ /finger@git:/
     end
     it "should not include the user if none is given" do
       @tc.has_git({:name => "git.git", :source => "git://source.git",:at => "/var/www/"}).to_string.should =~ /git clone git:/

data/spec/poolparty/poolparty_spec.rb

@@ -28,6 +28,6 @@ describe "PoolParty" do
     end
   end
   it "should have a logger" do
-    PoolParty.logger.should_not be_nil
+    PoolParty.log.should_not be_nil
   end
 end

data/spec/poolparty/provisioners/capistrano/capistrano_spec.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe "Capistrano provisioner" do
+  before(:each) do
+    @cloud = cloud :app do;end
+    @remote_instance = PoolParty::Remote::RemoteInstance.new({:ip => "192.168.0.1", :status => "running", :name => "master"}, @cloud)
+    stub_list_from_remote_for(@cloud)
+  end
+  describe "instance" do
+    before(:each) do
+      @pb = PoolParty::Provisioner::Capistrano.new(@remote_instance, @cloud)
+    end
+    it "should create the config on the initialize" do    
+      @pb.config.class.should == ::Capistrano::Configuration
+    end
+    describe "config" do
+      it "should create the config at ::Capistrano::Logger::INFO if the cloud is verbose" do
+        @cloud.stub!(:verbose).and_return true
+        PoolParty::Provisioner::Capistrano.new(nil, @cloud).config.logger.level.should == ::Capistrano::Logger::INFO
+      end
+      it "should create the config at ::Capistrano::Logger::IMPORTANT if the cloud is not verbose" do
+        @cloud.stub!(:verbose).and_return false
+        PoolParty::Provisioner::Capistrano.new(nil, @cloud).config.logger.level.should == ::Capistrano::Logger::IMPORTANT
+      end      
+    end
+  end
+end

data/spec/poolparty/provisioners/provisioner_base_spec.rb

@@ -0,0 +1,120 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+include Provisioner
+
+describe "ProvisionerBase" do
+  before(:each) do    
+    @cloud = cloud :app do;end
+    @remote_instance = PoolParty::Remote::RemoteInstance.new({:ip => "192.168.0.1", :status => "running", :name => "master"}, @cloud)
+    @pb = PoolParty::Provisioner::ProvisionerBase.new(@remote_instance, @cloud)
+    stub_list_from_remote_for(@cloud)
+    stub_remoting_methods_for(@cloud)
+  end
+  describe "class methods" do
+    it "should have install" do
+      ProvisionerBase.respond_to?(:install).should == true
+    end
+    it "should have configure" do
+      ProvisionerBase.respond_to?(:configure).should == true
+    end
+    describe "in action" do
+      it "should call a new ProvisionerBase" do
+        ProvisionerBase.should_receive(:new).with(@remote_instance, @cloud).and_return @pb
+        ProvisionerBase.install(@remote_instance, @cloud)
+      end
+    end
+  end
+  describe "instance methods" do
+    before(:each) do
+      @pb = PoolParty::Provisioner::ProvisionerBase.new(@remote_instance, @cloud)
+      stub_list_from_remote_for(@pb)
+      stub_list_from_remote_for(@cloud)
+      stub_remoting_methods_for(@pb)
+    end
+    it "should store the instance on the ProvisionerBase" do
+      @pb.instance.should == @remote_instance
+    end
+    it "should store the cloud on the ProvisionerBase" do
+      @pb.cloud.should == @cloud
+    end
+    it "should say provision_master? is true if the remote instance name is master" do
+      @pb.provision_master?.should == true
+    end
+    it "should say the provision_master? is false if the remote instance is not the master" do
+      @remote_instance.stub!(:master?).and_return false
+      @pb.provision_master?.should == false
+    end
+    it "should say the provision_master? is false if the remote instance is nil" do
+      PoolParty::Provisioner::ProvisionerBase.new(nil, @cloud).provision_master?.should == false
+    end
+    describe "custom tasks" do
+      it "should call custom_configure_tasks_for on the cloud with the instance" do
+        @cloud.should_receive(:custom_configure_tasks_for).with(@remote_instance).and_return []
+        @pb.custom_configure_tasks
+      end
+      it "should call custom_install_tasks_for on the cloud with the instance" do
+        @cloud.should_receive(:custom_install_tasks_for).with(@remote_instance).and_return []
+        @pb.custom_install_tasks
+      end
+    end
+    describe "installation" do
+      it "should have an install method" do
+        @pb.respond_to?(:install).should == true
+      end
+      it "should call error if it is not valid" do
+        @pb.stub!(:valid?).and_return false
+        lambda {@pb.install}.should raise_error
+      end
+      it "should not raise an exception if it is valid" do
+        @pb.stub!(:valid?).and_return true
+        lambda {@pb.install(true)}.should_not raise_error
+      end
+      it "should call before_install with the instance" do
+        @pb.should_receive(:before_install).with(@remote_instance).and_return true
+        @pb.install
+      end
+      it "should call setup_runner" do
+        @pb.should_receive(:setup_runner).and_return true
+        @pb.install
+      end
+      it "should call process_install! with the testing" do
+        @pb.should_receive(:process_install!).with(false).and_return true
+        @pb.install
+      end
+      it "should call after_install with the instance" do
+        @pb.should_receive(:after_install).with(@remote_instance).and_return true
+        @pb.install
+      end
+    end
+    describe "configuration" do
+      it "should have a configure method" do
+        @pb.respond_to?(:configure).should == true
+      end
+      it "should call error if it is not valid" do
+        @pb.stub!(:valid?).and_return false
+        lambda {@pb.configure}.should raise_error
+      end
+      it "should not raise an exception if it is valid" do
+        @pb.stub!(:valid?).and_return true
+        lambda {@pb.configure(true)}.should_not raise_error
+      end
+      it "should call before_configure with the instance" do
+        @pb.should_receive(:before_configure).with(@remote_instance).and_return true
+        @pb.configure
+      end
+      it "should call setup_runner" do
+        @pb.should_receive(:setup_runner).and_return true
+        @pb.configure
+      end
+      it "should call process_configure! with the testing" do
+        @pb.should_receive(:process_configure!).with(false).and_return true
+        @pb.configure
+      end
+      it "should call after_configure with the instance" do
+        @pb.should_receive(:after_configure).with(@remote_instance).and_return true
+        @pb.configure
+      end
+      
+    end
+  end
+end

data/spec/poolparty/spec_helper.rb

@@ -104,8 +104,22 @@ def stub_list_from_remote_for(o, launch_stub=true)
   # o.stub!(:master).and_return @ris[0]
   o.stub!(:launch_new_instance!).and_return sample_instances.first if launch_stub  
   stub_list_of_instances_for(o)
+  stub_remoting_methods_for(o)
+end
+def stub_remoting_methods_for(o)
+  o.stub!(:keypair).and_return "fake_keypair"
+  o.stub!(:keypair_path).and_return "~/.ec2/fake_keypair"
+  o.stub!(:other_clouds).and_return []
+  o.stub!(:expand_when).and_return "cpu > 10"
+  o.stub!(:copy_file_to_storage_directory).and_return true
+  o.stub!(:rsync_storage_files_to).and_return true
+  o.stub!(:minimum_runnable_options).and_return []
+  o.stub!(:build_and_store_new_config_file).and_return true
+  o.stub!(:process_clean_reconfigure_for!).and_return true
+  o.stub!(:before_install).and_return true
+  o.stub!(:process_install).and_return true
+  o.stub!(:after_install).and_return true
 end
-
 def stub_list_of_instances_for(o)  
   # o.stub!(:list_of_running_instances).once.and_return running_remote_instances
   o.stub!(:keypair).and_return "fake_keypair"

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.81</a>
+      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.83</a>
     </div>
     <h1>&#8216;Easy cloud computing&#8217;</h1>
 <h2>What</h2>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.81
+  version: 0.2.84
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-10 00:00:00 -08:00
+date: 2008-12-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,6 +70,7 @@ executables:
 - cloud-refresh
 - cloud-rsync
 - cloud-run
+- cloud-setup-dev
 - cloud-spec
 - cloud-ssh
 - cloud-start
@@ -99,6 +100,7 @@ executables:
 - server-stop-master
 - server-stop-node
 - server-update-hosts
+- server-write-new-nodes
 extensions: []
 
 extra_rdoc_files: 
@@ -111,6 +113,7 @@ extra_rdoc_files:
 - lib/poolparty/config/postlaunchmessage.txt
 - website/index.txt
 files: 
+- Capfile
 - History.txt
 - License.txt
 - Manifest.txt
@@ -131,6 +134,7 @@ files:
 - bin/cloud-refresh
 - bin/cloud-rsync
 - bin/cloud-run
+- bin/cloud-setup-dev
 - bin/cloud-spec
 - bin/cloud-ssh
 - bin/cloud-start
@@ -160,6 +164,7 @@ files:
 - bin/server-stop-master
 - bin/server-stop-node
 - bin/server-update-hosts
+- bin/server-write-new-nodes
 - config/hoe.rb
 - config/requirements.rb
 - examples/basic.rb
@@ -286,6 +291,7 @@ files:
 - lib/poolparty/base_packages/poolparty.rb
 - lib/poolparty/base_packages/ruby.rb
 - lib/poolparty/base_packages/runit.rb
+- lib/poolparty/capistrano.rb
 - lib/poolparty/config/postlaunchmessage.txt
 - lib/poolparty/core/array.rb
 - lib/poolparty/core/class.rb
@@ -306,6 +312,7 @@ files:
 - lib/poolparty/exceptions/CloudNotFoundException.rb
 - lib/poolparty/exceptions/LoadRulesException.rb
 - lib/poolparty/exceptions/MasterException.rb
+- lib/poolparty/exceptions/ProvisionerException.rb
 - lib/poolparty/exceptions/RemoteException.rb
 - lib/poolparty/exceptions/ResourceException.rb
 - lib/poolparty/exceptions/RuntimeException.rb
@@ -374,10 +381,12 @@ files:
 - lib/poolparty/poolparty/resources/symlink.rb
 - lib/poolparty/poolparty/resources/variable.rb
 - lib/poolparty/poolparty/script.rb
+- lib/poolparty/provisioners/capistrano/capistrano.rb
+- lib/poolparty/provisioners/capistrano/capistrano_configurer.rb
+- lib/poolparty/provisioners/capistrano/recipies/base.rb
+- lib/poolparty/provisioners/capistrano/recipies/master.rb
+- lib/poolparty/provisioners/capistrano/recipies/slave.rb
 - lib/poolparty/provisioners/provisioner_base.rb
-- lib/poolparty/provisioners/provisioners/become_master.rb
-- lib/poolparty/provisioners/provisioners/master.rb
-- lib/poolparty/provisioners/provisioners/slave.rb
 - lib/poolparty/spec/core/string.rb
 - lib/poolparty/spec/matchers/a_spec_extensions_base.rb
 - lib/poolparty/spec/matchers/have_cron.rb
@@ -445,9 +454,6 @@ files:
 - 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
@@ -456,6 +462,7 @@ files:
 - spec/poolparty/monitors/base_monitor_spec.rb
 - spec/poolparty/monitors/monitors/cpu_monitor_spec.rb
 - spec/poolparty/monitors/monitors/memory_monitor_spec.rb
+- spec/poolparty/net/log/pool.log
 - spec/poolparty/net/messenger_spec.rb
 - spec/poolparty/net/remote_bases/ec2_spec.rb
 - spec/poolparty/net/remote_instance_spec.rb
@@ -497,6 +504,8 @@ files:
 - spec/poolparty/poolparty/test_plugins/virtual_host_template.erb
 - spec/poolparty/poolparty/test_plugins/webserver.rb
 - spec/poolparty/poolparty_spec.rb
+- spec/poolparty/provisioners/capistrano/capistrano_spec.rb
+- spec/poolparty/provisioners/provisioner_base_spec.rb
 - spec/poolparty/spec/core/string_spec.rb
 - spec/poolparty/spec_helper.rb
 - tasks/cloud.rake
@@ -521,7 +530,7 @@ files:
 has_rdoc: true
 homepage: http://poolparty.rubyforge.org
 post_install_message: |-
-  Get ready to jump in the pool, you just installed PoolParty! (Updated at 13:44 12/10/08)
+  Get ready to jump in the pool, you just installed PoolParty! (Updated at 19:18 12/13/08)
   
   To get started, run the generator:
   

data/lib/poolparty/provisioners/provisioners/become_master.rb

@@ -1,166 +0,0 @@
-module PoolParty
-  module Provisioner
-    class BecomeMaster < ProvisionerBase
-      
-      def initialize(cl=self, os=:ubuntu)
-        raise MasterException.new(:no_ip) unless cl.master && cl.master.ip
-        super(cl.master, cl, os)
-        @master_ip = cl.master.ip
-      end
-
-      def valid?
-        !(@cloud.nil? || @cloud.master.nil?)
-      end
-
-      def error
-        raise RemoteException.new(:could_not_install, "Your cloud does not have a master")
-      end
-      
-      def first_install_tasks
-        [
-          create_local_hosts_entry
-        ]
-      end
-
-      def install_tasks
-        [          
-          setup_basic_structure,
-          setup_configs,        
-          setup_fileserver,
-          setup_autosigning,
-          restart_puppetmaster,
-          run_first_time,
-          create_local_node,
-        ] << configure_tasks
-      end
-
-      def configure_tasks
-        [
-          create_local_node,
-          move_templates,
-          setup_poolparty,
-          create_poolparty_manifest,
-          restart_puppetd
-        ]
-      end
-      
-      # If the master is not in the hosts file, then add it to the hosts file
-      def create_local_hosts_entry
-        <<-EOS
-echo "Creating local host entry"
-if [ -z \"$(grep -v '#' /etc/hosts | grep 'puppet')" ]; then echo '#{@master_ip}          master puppet localhost' >> /etc/hosts; fi
-hostname master
-        EOS
-      end
-
-      def setup_basic_structure
-        <<-EOS
-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
-cp #{Base.remote_storage_path}/namespaceauth.conf /etc/puppet/namespaceauth.conf
-        EOS
-      end
-
-      def setup_configs
-        <<-EOS
-echo "Setting up configuration"        
-cp #{Base.remote_storage_path}/puppet.conf /etc/puppet/puppet.conf
-        EOS
-      end
-
-      def setup_fileserver
-        <<-EOS
-echo "Setting up the master fileserver"
-echo "
-[files]
-  path #{Base.remote_storage_path}
-  allow *" > /etc/puppet/fileserver.conf
-mkdir -p /var/poolparty/facts
-mkdir -p /var/poolparty/files
-mkdir -p /etc/poolparty
-        EOS
-      end
-      # Change this eventually for better security supportsetup_fileserver
-      def setup_autosigning
-        <<-EOS
-echo "Creating accessibility for the nodes"        
-echo "*" > /etc/puppet/autosign.conf
-        EOS
-      end
-      
-      def setup_poolparty
-        <<-EOS
-echo "Setting the poolparty configuration"
-cp #{Base.remote_storage_path}/#{Base.key_file_locations.first} "#{Base.base_config_directory}/.ppkeys"
-mv #{Base.remote_storage_path}/#{Base.default_specfile_name} #{Base.base_config_directory}/
-        EOS
-      end
-            
-      def copy_ssh_app
-        "cp #{Base.remote_storage_path}/#{@cloud.full_keypair_name} #{@cloud.remote_keypair_path}" if @cloud.remote_keypair_path != "#{Base.remote_storage_path}/#{@cloud.full_keypair_name}"
-      end
-            
-      # /etc/init.d/puppetmaster stop; rm -rf /etc/puppet/ssl; /etc/init.d/puppetmaster start
-      # ps aux | grep puppetmaster | grep -v grep | awk '{print $2}' | xargs kill;
-      def restart_puppetmaster
-        <<-EOS
-echo "(Re)starting poolparty"
-. /etc/profile
-/etc/init.d/puppetmaster stop;rm -rf /etc/poolparty/ssl;puppetmasterd --verbose;/etc/init.d/puppetmaster start
-        EOS
-      end
-      
-      def run_first_time
-<<-EOE
-echo "Running first time run"
-cp #{Base.remote_storage_path}/#{Base.template_directory}/puppetrunner /usr/bin/puppetrunner
-chmod +x /usr/bin/puppetrunner
-EOE
-      end
-
-      # TODO:
-      # Consider this method in the manifest
-      def create_local_node
-        str = <<-EOS
-node default {
-  include poolparty
-}
-        EOS
-         @cloud.list_of_running_instances.each do |ri|
-           str << <<-EOS           
-node "#{ri.name}" inherits default {}
-           EOS
-         end
-"echo '#{str}' > #{Base.manifest_path}/nodes/nodes.pp"
-      end
-
-      def move_templates
-        <<-EOS
-echo "Moving templates into place"
-mkdir -p #{Base.template_path}
-cp -R #{Base.remote_storage_path}/#{Base.template_directory}/* #{Base.template_path}
-        EOS
-      end
-      
-      def create_poolparty_manifest
-        <<-EOS
-echo "Creating the manifest"
-cp #{Base.remote_storage_path}/poolparty.pp /etc/puppet/manifests/classes/poolparty.pp
-#{copy_ssh_app}
-        EOS
-      end
-            
-      def restart_puppetd
-        # /usr/bin/puppetrerun
-        # /usr/bin/puppetcleaner master
-        <<-EOS
-echo "Running puppet manifest"
-/usr/bin/puppetrerun
-        EOS
-      end
-    end
-  end
-end