lib/poolparty/provisioners/capistrano/recipies/master.rb in auser-poolparty-0.2.85 vs lib/poolparty/provisioners/capistrano/recipies/master.rb in auser-poolparty-0.2.88

@@ -1,10 +1,10 @@
 # Cloud tasks
 Capistrano::Configuration.instance(:must_exist).load do
-  namespace(:master) do
+  # namespace(:master) do
     desc "Provision master"
-    task :provision_master do
+    def master_provision_master_task
       upgrade_system
       set_hostname_to_master
       create_local_hosts_entry
       setup_for_poolparty
       install_provisioner
@@ -21,66 +21,36 @@
       download_base_gems
       install_base_gems
       write_erlang_cookie
     end
     desc "Configure master"
-    task :configure_master do
-      master:move_provisioner_manifest
-      master:move_template_files
-      master:setup_poolparty_base_structure
+    def master_configure_master_task
+      create_local_node_entry_for_puppet
+      move_provisioner_manifest
+      move_template_files
+      setup_poolparty_base_structure
+      ensure_provisioner_is_running
       run_provisioner
     end
     desc "Set hostname to master"
-    task :set_hostname_to_master do
+    def set_hostname_to_master
       run "hostname master"
     end
     desc "Add host entry into the master instance"
-    task :create_local_hosts_entry do
+    def create_local_hosts_entry
       run "if [ -z \"$(grep -v '#' /etc/hosts | grep 'puppet')\" ]; then echo '#{cloud.master.ip}          master puppet localhost' >> /etc/hosts; fi"
     end
-    desc "Setup basic poolparty structure"
-    task :setup_basic_poolparty_structure do
-      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"
-    task :setup_provisioner_filestore do
-      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"
-    task :setup_provisioner_autosigning do
-      run "echo \"*\" > /etc/puppet/autosign.conf"
-    end
-    desc "Setup poolparty structure"
-    task :setup_poolparty_base_structure do
-      run <<-EOR
-        cp #{remote_storage_path}/#{key_file_locations.first} "#{base_config_directory}/.ppkeys" &&
-        mv #{remote_storage_path}/#{default_specfile_name} #{base_config_directory}/
-      EOR
-    end
     desc "Download base gems"
-    task :download_base_gems do
+    def download_base_gems
       run(returning(Array.new) do |arr|
         base_gems.each do |name, url|
           arr << "wget #{url} -O #{Base.remote_storage_path}/#{name}.gem 2>&1"
         end
       end.join(" && "))
     end
     desc "Install base gems"
-    task :install_base_gems do
+    def install_base_gems
       run(returning(Array.new) do |arr|
         base_gems.each do |name, url|
           if url.empty?
             arr << "/usr/bin/gem install --ignore-dependencies --no-ri --no-rdoc #{name}"
           else
@@ -88,42 +58,46 @@
           end          
         end
       end.join(" && "))
     end
     desc "Start provisioner base"
-    task :start_provisioner_base do
+    def start_provisioner_base
       run "/etc/init.d/puppetmaster start"
     end
     desc "Restart provisioner base"
-    task :restart_provisioner_base do
+    def restart_provisioner_base
       run "/etc/init.d/puppetmaster stop;rm -rf /etc/poolparty/ssl;puppetmasterd --verbose;/etc/init.d/puppetmaster start"
     end
+    desc "Ensure provisioner is running"
+    def ensure_provisioner_is_running
+      run "/usr/sbin/puppetmasterd --verbose 2>1 > /dev/null;echo ''"
+    end
     desc "Create local node for puppet manifest"
-    task :create_local_node_entry_for_puppet do
+    def create_local_node_entry_for_puppet
       # run ". /etc/profile && server-write-new-nodes"
       str = returning Array.new do |arr|
         arr << "node default { include poolparty }"
         list_of_running_instances.each do |ri| 
           arr << "node \"#{ri.name}\" inherits default {}\n"
         end
       end.join("\n")
       run "echo #{str} > #{manifest_path}/nodes/nodes.pp"
     end
     desc "Move template files into place"
-    task :move_template_files do
+    def move_template_files
       run <<-EOR
         mkdir -p #{template_path} &&
         cp -R #{remote_storage_path}/templates/* #{template_path}
       EOR
     end
     desc "Move manifest into place" 
-    task :move_provisioner_manifest do
+    def move_provisioner_manifest
       run <<-EOR
         cp #{remote_storage_path}/poolparty.pp /etc/puppet/manifests/classes/poolparty.pp
       EOR
     end
     desc "Move poolparty keys"
-    task :move_poolparty_keys do
+    def move_poolparty_keys
       run "cp #{remote_storage_path}/#{@full_keypair_name} #{@remote_keypair_path}"
     end
-  end
+  # end
 end
\ No newline at end of file