poolparty 0.2.18 → 0.2.69

data/lib/poolparty/helpers/console.rb

@@ -5,15 +5,30 @@ module PoolParty
     
     include Display
     
-    # Load a file that contains a pool into memory
-    def load_pool(filename)
-      filename = filename.chomp
-      unless filename && ::File.readable?(filename)
-        puts "Could not load pool: #{filename}"
-        exit
-      else
-        PoolParty::Script.inflate(open(filename).read, File.dirname(filename))
+    # Print help commands for the console
+    # level 0 - Basic help
+    # level 1 - Commands
+    def help(level=0)
+      @np = NicePrinter.new(60)
+      @np.header
+      @np.center "PoolParty console help"      
+      @np.center "Basics"
+      @np << "Load your pool with load_pool(filename)"
+      @np << "Reference clouds with"
+      @np << "c = cloud :cloudname"
+      @np.empty
+      if level >= 1
+        @np.center "CloudSpeak"
+        @np << "All the commands set on your cloud can be called within the console"
+        @np << "list_of_running_instances - get list of running nodes"
+        @np << "list_of_pending_instances - get list of pending nodes"
+        @np << "available_monitors - get list of the available monitors on the cloud"
+        @np << "  note: all monitors can be called as a method on the cloud"
+        @np << "    i.e. CpuMonitor makes the method cpu available on the cloud"
+        @np.empty
       end
+      @np.footer
+      @np.print
     end
     
     # Clear all the pools and reload the console
@@ -21,6 +36,8 @@ module PoolParty
     # as well
     def reload!      
       reset!
+      require File.dirname(__FILE__) + "/../../../poolparty"
+      require File.dirname(__FILE__) + "/../../../poolpartycl"
     end
     
   end

data/lib/poolparty/helpers/nice_printer.rb

@@ -0,0 +1,36 @@
+class NicePrinter
+  
+  attr_accessor :num_lines
+  attr_reader :centered_lines
+  
+  def initialize(num_lines=60)
+    @num_lines = num_lines
+    @centered_lines = @num_lines - 4
+  end
+  
+  def center(line)
+    lines << "* #{line.center(@centered_lines)} *"
+  end
+  def left(line)
+    lines << "* #{line.ljust(@centered_lines)} *"
+  end
+  def header
+    lines << "*"*@num_lines
+  end
+  def footer
+    header
+  end
+  def empty
+    lines << "* #{" ".ljust(@centered_lines)} *"
+  end
+  def print
+    puts lines.join("\n")
+    ""
+  end
+  def <<(line)
+    left(line)
+  end
+  def lines
+    @lines ||= []
+  end
+end

data/lib/poolparty/helpers/optioner.rb

@@ -1,4 +1,6 @@
 require 'optparse' 
+require "poolparty"
+require "poolpartycl"
 require 'rdoc/usage'
 require 'ostruct'
 require 'date'
@@ -11,9 +13,12 @@ module PoolParty
     def initialize(args=[], opts={}, &block)
       @arguments = parse_args(args)
       @parse_options = opts[:parse_options] ? opts[:parse_options] : true
+      @extra_help = opts.has_key?(:extra_help) ? opts[:extra_help] : ""
+      @abstract = opts[:abstract] ? opts[:abstract] : false
+      @command = opts[:command] ? opts[:command] : false
       
-      set_default_options
       parse_options(&block) if @parse_options
+      set_default_options
       self
     end
     
@@ -26,43 +31,73 @@ module PoolParty
     end
     
     def set_default_options
-      @options = {}
-      @options[:verbose] = false
-      @options[:quiet] = false
-      @options[:version] = PoolParty::VERSION::STRING
+      self.verbose false
+      self.quiet false
     end
     
     def parse_options(&blk)
+      progname = $0.include?("-") ? "#{::File.basename($0[/(\w+)-/, 1])} #{::File.basename($0[/-(.*)/, 1])}" : ::File.basename($0)
       opts = OptionParser.new 
-      opts.banner = "Usage: pool [command] [options]"
+      opts.banner = "Usage: #{progname} #{@abstract ? "[command] " : ""}[options]"
 
       opts.separator ""
-      opts.separator "Options:"
       
-      opts.on('-V', '--version', 'Display the version')    { output_version ; exit 0 }
-      opts.on('-v', '--verbose', 'Be verbose')    { @options[:verbose] = true }  
-      opts.on('-s [file]', '--spec-file [file]', 'Set the spec file')      { |file| self.spec file }
-      opts.on('-t', '--test', 'Testing mode')    { self.testing "true" }
-                  
-      blk.call(opts, self) if blk
+      unless @abstract
+        opts.separator "Options:"
+        
+        opts.on('-v', '--verbose', 'Be verbose')    { self.verbose true }  
+        opts.on('-s [file]', '--spec-file [file]', 'Set the spec file')      { |file| self.spec file.chomp }
+        opts.on('-t', '--test', 'Testing mode')    { self.testing true }
+
+        blk.call(opts, self) if blk
+      end
       
+      opts.on('-V', '--version', 'Display the version')    { puts @version ; exit 0 }
       opts.on_tail("-h", "--help", "Show this message") do
         puts opts
+        puts @extra_help
         exit
       end
       
       opts.parse(@arguments.dup)
       
-      process_options      
+      process_options
       output_options if verbose
+      unless @abstract
+        self.loaded_pool load_pool(self.spec || Binary.get_existing_spec_location)
+
+        self.loaded_clouds extract_cloud_from_options(self)
+        self.loaded_pools extract_pool_from_options(self)
+
+        reject_junk_options!
+        raise CloudNotFoundException.new("Please specify your cloud with -s, move it to ./pool.spec or in your POOL_SPEC environment variable") unless loaded_clouds && !loaded_clouds.empty?
+        loaded_pools.each do |pl|
+          pl.configure(self.options)
+        end
+        loaded_clouds.each do |cl|
+          cl.configure(self.options)
+        end
+      end
+    end
+    def reject_junk_options!
+      %w(loaded_pool cloudname extract_pool_from_options).each do |opt|
+        @options.delete(opt.to_sym)
+      end
     end
     def process_options
-      @options[:verbose] = false if @options[:quiet]
     end
         
     def output_version
-      puts version
+      puts @version
     end
     
   end
+  
+  def extract_cloud_from_options(o)
+    o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds.collect {|n,cl| cl}
+  end
+  
+  def extract_pool_from_options(o)
+    o.poolname ? [pool(o.poolname.downcase.to_sym)] : pools.collect {|n,pl| pl}
+  end
 end

data/lib/poolparty/helpers/provisioner_base.rb

@@ -15,9 +15,13 @@ module PoolParty
     def self.configure_master(cloud, testing=false)
       Provisioner::Master.new(cloud).process_configure!(testing)
     end
+    
+    def self.reconfigure_master(cloud, testing=false)
+      Provisioner::Master.new(cloud).process_reconfigure!(testing)
+    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
@@ -36,17 +40,26 @@ module PoolParty
       Provisioner::Slave.new(instance, cloud).process_configure!(testing)
     end
     
+    def self.process_clean_reconfigure_for!(instance, cloud, testing=false)
+      Provisioner::Master.new(cloud).process_clean_reconfigure_for!(instance, testing)
+    end
+    
+    def self.clear_master_ssl_certs(cloud, testing=false)
+      Provisioner::Master.new(cloud).clear_master_ssl_certs
+    end
+    
     class ProvisionerBase
       
       include Configurable
       include CloudResourcer
+      include FileWriter
       
-      def initialize(instance,cloud=self, os=:ubuntu)
+      def initialize(instance,cld=self, os=:ubuntu)
         @instance = instance
-        @cloud = cloud
+        @cloud = cld
         
         options(cloud.options) if cloud && cloud.respond_to?(:options)
-        set_vars_from_options(instance.options) unless instance.nil? || instance.options.empty?
+        set_vars_from_options(instance.options) unless instance.nil? || !instance.options || !instance.options.empty?
         options(instance.options) if instance.respond_to?(:options)
         
         @os = os.to_s.downcase.to_sym
@@ -55,32 +68,56 @@ module PoolParty
       # Callback after initialized
       def loaded(opts={}, parent=self)      
       end
+      
+      ### Installation tasks
+      
       # This is the actual runner for the installation    
       def install
         valid? ? install_string : error
       end
+      # Write the installation tasks to a file in the storage directory
       def write_install_file
         error unless valid?
         ::FileUtils.mkdir_p Base.storage_directory unless ::File.exists?(Base.storage_directory)
         provisioner_file = ::File.join(Base.storage_directory, "install_#{name}.sh")
         ::File.open(provisioner_file, "w+") {|f| f << install }
       end
+      def name
+        @instance.name
+      end
+      # TODO: Clean up this method
       def process_install!(testing=false)
         error unless valid?
         write_install_file
-        setup_runner(@cloud)
+        setup_runner
         
         unless testing
-          puts "Logging on to #{@instance.ip}" if verbose
-          @cloud.prepare_reconfiguration
+          vputs "Logging on to #{@instance.ip} (#{@instance.name})"
           @cloud.rsync_storage_files_to(@instance)
+          vputs "Preparing configuration on the master"
+          
+          before_install(@instance)
+          
+          process_clean_reconfigure_for!(@instance, testing)
+          
+          vputs "Logging in and running provisioning on #{@instance.name}"
+          cmd = "cd #{Base.remote_storage_path} && /bin/chmod +x install_#{name}.sh && /bin/sh install_#{name}.sh; /bin/rm install_#{name}.sh"
+          verbose ? @cloud.run_command_on(cmd, @instance) : hide_output {@cloud.run_command_on(cmd, @instance)}
+          
+          process_clean_reconfigure_for!(@instance, testing)
           
-          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          
-        end        
+          after_install(@instance)
+        end
+      end
+      # Install callbacks
+      # Before installation callback
+      def before_install(instance)        
       end
+      def after_install(instance)        
+      end
+      
+      ### Configuraton tasks
+      
       def configure
         valid? ? configure_string : error
       end
@@ -92,19 +129,48 @@ module PoolParty
       def process_configure!(testing=false)
         error unless valid?
         write_configure_file
-        setup_runner(@cloud)        
+        setup_runner
         
         unless testing
-          puts "Logging on to #{@instance.ip}" if verbose
+          vputs "Logging on to #{@instance.ip}"
           @cloud.rsync_storage_files_to(@instance)
 
-          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)
+          cmd = "cd #{Base.remote_storage_path} && /bin/chmod +x configure_#{name}.sh && /bin/sh configure_#{name}.sh && /bin/rm configure_#{name}.sh"
+          verbose ? @cloud.run_command_on(cmd, @instance) : hide_output {@cloud.run_command_on(cmd, @instance)}
+        end
+      end
+      def process_clean_reconfigure_for!(instance, testing=false)
+        if instance.is_a?(String)
+          name = instance
+          instance = MyOpenStruct.new(:name => name)
         end
+        vputs "Cleaning certs from master: #{instance.name}"
+        # puppetca --clean #{instance.name}.compute-1.internal; puppetca --clean #{instance.name}.ec2.internal
+        # find /etc/puppet/ssl -type f -exec rm {} \;
+        unless testing
+          # @cloud.run_command_on("rm -rf /etc/puppet/ssl", instance) unless instance.master?
+          str = returning String.new do |s|
+            s << "puppetca --clean #{instance.name}.compute-1.internal 2>&1 > /dev/null;"
+            s << "puppetca --clean #{instance.name}.ec2.internal 2>&1 > /dev/null"
+          end
+          @cloud.run_command_on(str, @cloud.master)
+        end
+      end
+      def clear_master_ssl_certs
+        str = returning String.new do |s|
+          s << "puppetca --clean master.compute-1.internal 2>&1 > /dev/null;"
+          s << "puppetca --clean master.ec2.internal 2>&1 > /dev/null"
+        end
+        @cloud.run_command_on("if [ -f '/usr/bin/puppetcleaner' ]; then /usr/bin/env puppetcleaner; else #{str}; fi", @cloud.master)
+      end
+      def process_reconfigure!(testing=false)
+        @cloud.run_command_on(PoolParty::Remote::RemoteInstance.puppet_runner_command, @instance) unless testing
       end
-      def setup_runner(cloud)
-        cloud.prepare_to_configuration
-        cloud.build_and_store_new_config_file
+      # Tasks that need to be performed everytime we do any
+      # remote ssh'ing into any instance
+      def setup_runner(force=false)
+        @cloud.prepare_for_configuration
+        @cloud.build_and_store_new_config_file(force)
       end
       def valid?
         true
@@ -114,7 +180,7 @@ module PoolParty
       end
       # Gather all the tasks into one string
       def install_string
-        (default_install_tasks).each do |task|
+        [default_install_tasks, last_install_tasks].flatten.each do |task|
           case task.class
           when String
             task
@@ -123,8 +189,11 @@ module PoolParty
           end
         end.nice_runnable
       end
+      def last_install_tasks
+        []
+      end
       def configure_string
-        (default_configure_tasks).each do |task|
+        [default_configure_tasks, last_configure_tasks].flatten.each do |task|
           case task.class
           when String
             task
@@ -133,12 +202,17 @@ module PoolParty
           end
         end.nice_runnable
       end
+      def last_configure_tasks
+        []
+      end
       # Tasks with default tasks 
       # These are run on all the provisioners, master or slave
       def default_install_tasks
         [
+          "#!/usr/bin/env sh",
           upgrade_system,
           fix_rubygems,
+          make_logger_directory,
           install_puppet,
           custom_install_tasks
         ] << install_tasks
@@ -208,7 +282,11 @@ module PoolParty
       end
       
       def fix_rubygems
-        "echo '#{open(::File.join(template_directory, "gem")).read}' > /usr/bin/gem"
+        <<-EOE
+          #{installer_for("ruby rubygems")}
+          gem update --system # Force rubygems update
+          echo '#{open(::File.join(template_directory, "gem")).read}' > /usr/bin/gem
+        EOE
       end
 
       def create_local_node
@@ -228,11 +306,18 @@ module PoolParty
       def upgrade_system
         case @os
         when :ubuntu
-          "          
-          touch /etc/apt/sources.list
-          echo 'deb http://mirrors.kernel.org/ubuntu hardy main universe' >> /etc/apt/sources.list
-          aptitude update -y
-          aptitude autoclean
+          "
+if grep -q 'http://mirrors.kernel.org/ubuntu hardy main universe' /etc/apt/sources.list
+then 
+echo 'Updated already'
+else
+touch /etc/apt/sources.list
+echo 'deb http://mirrors.kernel.org/ubuntu hardy main universe' >> /etc/apt/sources.list
+aptitude update -y #{unix_hide_string} <<heredoc
+Y
+
+heredoc
+fi
           "
         else
           "# No system upgrade needed"
@@ -242,7 +327,11 @@ module PoolParty
       def install_puppet
         "#{installer_for( puppet_packages )}"
       end
-
+      
+      def make_logger_directory
+        "mkdir -p /var/log/poolparty"
+      end
+      
       def create_poolparty_manifest
         <<-EOS
           cp #{Base.remote_storage_path}/poolparty.pp /etc/puppet/manifests/classes

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

@@ -2,9 +2,10 @@ module PoolParty
   module Provisioner
     class Master < ProvisionerBase
       
-      def initialize(cloud=self, os=:ubuntu)
-        super(cloud.master, cloud, os)
-        @master_ip = cloud.master.ip
+      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?
@@ -17,19 +18,21 @@ module PoolParty
 
       def install_tasks
         [
-          install_haproxy,
-          install_heartbeat,
           create_local_hosts_entry,
           setup_basic_structure,
           setup_configs,        
           setup_fileserver,
-          setup_autosigning,          
+          setup_autosigning,
+          install_poolparty,
+          setup_poolparty,
+          restart_puppetmaster,
+          run_first_time,
+          create_local_node,
         ] << configure_tasks
       end
 
       def configure_tasks
         [
-          # start_puppetmaster,
           create_local_node,
           move_templates,
           create_poolparty_manifest,
@@ -40,30 +43,33 @@ module PoolParty
       # 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
+echo "Creating local host entry"
+if [ -z \"$(grep -v '#' /etc/hosts | grep 'puppet')" ]; then echo '#{@master_ip}           puppet master localhost' >> /etc/hosts; fi
+hostname master
         EOS
       end
 
       def setup_basic_structure
         <<-EOS
-puppetmasterd --mkusers
-mkdir -p #{Base.remote_storage_path}
-echo "import 'nodes/*.pp'" > /etc/puppet/manifests/site.pp
-echo "import 'classes/*.pp'" >> /etc/puppet/manifests/site.pp
+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"        
 echo "#{open(File.join(template_directory, "puppet.conf")).read}" > /etc/puppet/puppet.conf
         EOS
       end
 
       def setup_fileserver
         <<-EOS
+echo "Setting up the master fileserver"
 echo "
 [files]
   path #{Base.remote_storage_path}
@@ -76,10 +82,75 @@ mkdir -p /etc/poolparty
       # 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"
+cp #{Base.remote_storage_path}/#{Base.default_specfile_name} #{Base.base_config_directory}/#{Base.default_specfile_name}
+        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
+      
+      def install_poolparty
+        <<-EOE
+echo "Installing poolparty"
+cd /var/poolparty
+wget http://rubyforge.org/frs/download.php/44731/logging-0.9.4.gem -O logging.gem 2>&1
+wget http://rubyforge.org/frs/download.php/45581/ZenTest-3.11.0.gem -O ZenTest.gem 2>&1
+wget http://rubyforge.org/frs/download.php/45600/ParseTree-3.0.1.gem -O ParseTree.gem 2>&1
+wget http://rubyforge.org/frs/download.php/45587/ruby2ruby-1.2.0.gem -O ruby2ruby.gem 2>&1
+wget http://rubyforge.org/frs/download.php/45627/activesupport-2.1.2.gem -O activesupport.gem 2>&1
+wget http://rubyforge.org/frs/download.php/18366/xml-simple-1.0.11.gem -O xml-simple.gem 2>&1
+wget http://rubyforge.org/frs/download.php/45683/RubyInline-3.8.1.gem -O RubyInline.gem 2>&1
+wget http://rubyforge.org/frs/download.php/42580/flexmock-0.8.3.gem -O flexmock.gem 2>&1
+wget http://rubyforge.org/frs/download.php/45685/hoe-1.8.2.gem -O hoe.gem 2>&1
+wget http://rubyforge.org/frs/download.php/18698/lockfile-1.4.3.gem -O lockfile.gem 2>&1
+wget http://rubyforge.org/frs/download.php/45546/rubyforge-1.0.1.gem -O rubyforge.gem 2>&1
+wget http://rubyforge.org/frs/download.php/43954/rake-0.8.3.gem -O rake.gem 2>&1
+wget http://rubyforge.org/frs/download.php/45589/sexp_processor-3.0.0.gem -O sexp_processor.gem 2>&1
+wget http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty.gem?raw=true -O poolparty.gem 2>&1
+# wget http://rubyforge.org/frs/download.php/43666/amazon-ec2-0.3.1.gem -O amazon-ec2.gem 2>&1
 
+#{
+  %w(rake lockfile rubyforge hoe ZenTest sexp_processor flexmock logging activesupport 
+      RubyInline ParseTree ruby2ruby xml-simple poolparty).map do |dep|
+    "gem install --ignore-dependencies -y --no-ri --no-rdoc #{dep}.gem #{unix_hide_string}"
+  end.join("\n")
+}
+        EOE
+      end
+      
+      # ps aux | grep puppetmasterd | awk '{print $2}' | xargs kill
+      # /etc/init.d/puppetmaster stop; rm -rf /etc/puppet/ssl; /etc/init.d/puppetmaster start
+      def restart_puppetmaster
+        <<-EOS
+echo "(Re)starting poolparty"
+. /etc/profile
+# /etc/init.d/puppetmaster stop #{unix_hide_string}
+ps aux | grep puppetmaster | awk '{print $2}' | xargs kill;rm -rf /etc/puppet/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}/puppetrerun /usr/bin/puppetrerun
+cp #{Base.remote_storage_path}/#{Base.template_directory}/puppetrunner /usr/bin/puppetrunner
+chmod +x /usr/bin/puppetrerun
+chmod +x /usr/bin/puppetrunner
+EOE
+      end
+
+      # TODO:
+      # Consider this method in the manifest
       def create_local_node
         str = <<-EOS
 node default {
@@ -91,48 +162,44 @@ node default {
 node "#{ri.name}" inherits default {}
            EOS
          end
-"echo '#{str}' > /etc/puppet/manifests/nodes/nodes.pp"
+"echo '#{str}' > #{Base.manifest_path}/nodes/nodes.pp"
       end
 
       def move_templates
         <<-EOS
+echo "Moving templates into place"
 mkdir -p #{Base.template_path}
-cp #{Base.remote_storage_path}/#{Base.template_directory}/* #{Base.template_path}
+cp -R #{Base.remote_storage_path}/#{Base.template_directory}/* #{Base.template_path}
         EOS
       end
       
       def create_poolparty_manifest
         <<-EOS
-mv #{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}
+echo "Creating the manifest"
+cp #{Base.remote_storage_path}/poolparty.pp /etc/puppet/manifests/classes/poolparty.pp
 #{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
-        EOS
+      def clean_master_certs
+        str = returning Array.new do |s|
+          s << "puppetca --clean master.compute-1.internal 2>&1 > /dev/null"
+          s << "puppetca --clean master.ec2.internal 2>&1 > /dev/null"
+        end.join(";")
+        "if [ -f '/usr/bin/puppetcleaner' ]; then /usr/bin/env puppetcleaner; else #{str}; fi"
       end
-
-      # puppetd --listen --fqdn #{@instance.name}
+      
       def restart_puppetd
         <<-EOS
-          killall ruby
-          rm -rf /etc/puppet/ssl/*
-          puppetmasterd --verbose
-          . /etc/profile && #{@instance.puppet_runner_command}
+echo "Running puppet manifest"
+/usr/bin/puppetrunner
         EOS
       end
+      def last_install_tasks
+        [
+          "/usr/bin/puppetrerun"
+        ]
+      end
     end
   end
 end