auser-poolparty 1.2.10 → 1.2.11

data/lib/poolparty/net/remoter_bases/metavirt/metavirt_instance.rb

@@ -1,52 +1,37 @@
-module PoolParty  
+module PoolParty
   module Remote
     
-    class MetavirtInstance
-      attr_reader :ip, :mac_address, :vmx_file, :keypair, :cloud
-      
-      def initialize(o={}, cld=nil)
-        @ip = o[:ip]
-        @keypair = o[:keypair]        
-        @cloud = cld
-      end
+    class MetavirtInstance < RemoteInstance
+      dsl_methods :mac_address, 
+                  :vmx_file
       
       def to_hash
         {
-          :status => status,
-          :mac_addresses => mac_address,
-          :ip => ip,
-          :instance_id => vmx_file,
-          :internal_ip => ip,
-          :keypair => keypair
+          :status         => status,
+          :mac_addresses  => mac_address,
+          :ip             => ip,
+          :instance_id    => instance_id,
+          :internal_ip    => internal_ip,
+          :keypair_name   => keypair.basename
         }
       end
       
-      def status
-        "running"
-      end      
-      # Is this instance running?
-      def running?
-        true
-      end
-      # Is this instance pending?
-      def pending?
-        false
-      end
-      # Is this instance terminating?
-      def terminating?
-        false
-      end
-      # Has this instance been terminated?
-      def terminated?
-        false
+      def keypair(n=nil)
+        if n.nil?
+          @keypair ||= Key.new(keypair_name)
+        else
+          @keypair = Key.new(n)
+        end
       end
       
       def launch!
       end
-      def terminate!(o)
+      
+      def terminate!
+        `virsh destroy #{instance_id}`
       end
       
-    end    
+    end
     
   end
 end

data/lib/poolparty/net/remoter_bases/vmrun/vmrun.rb

@@ -38,7 +38,11 @@ module PoolParty
         :vmx_hash            => {},  # hash of vmx_filename => ip
         :images_repo_path    => ::File.expand_path("~/Documents/Virtual_Machines.localized/")
       )
-
+      
+      def image_id
+        next_unused_vmx_file
+      end
+      
       def vmx_files(n=nil)
         if n.nil?
           dsl_options[:vmx_files] || vmx_hash.keys
@@ -46,7 +50,7 @@ module PoolParty
           dsl_options[:vmx_files] = n
         end
       end
-
+      
       def self.launch_new_instance!(o={})
         # puts "launch_new_instance 0 = #{o.inspect}"
         new(o).launch_new_instance!
@@ -56,8 +60,8 @@ module PoolParty
         vmx_file = next_unused_vmx_file
         VmwareInstance.new( {:vmx_file  => vmx_file, 
                              :public_ip => ip(vmx_file),
-                             :ip => ip(vmx_file),
-                             :keypair => keypair
+                             :ip        => ip(vmx_file),
+                             :keypair   => keypair
                             }.merge(o)
                           ).launch!
       end
@@ -85,8 +89,7 @@ module PoolParty
         new(o).describe_instances
       end
       def describe_instances(o={})
-        # TODO: WTF
-        running_instances.map {|a| a.to_hash.merge(:public_ip => ip(a.vmx_file), :ip => ip(a.vmx_file)) }
+        running_instances
       end
 
       # After launch callback
@@ -109,16 +112,31 @@ module PoolParty
         end
       end
       
+      # def id(vfile=nil)
+      #   vfile.nil? ?   : vmx_files[vfile]
+      # end
+      # alias :image_id :id
+      
       private
       
       def running_instances(o={})
-        output = run_local "#{path_to_binary} list"
-        lines = output.split("\n")
-        lines.shift
-        lines.map {|vmx_file| VmwareInstance.new( :vmx_file => vmx_file, 
-                                                  :ip => ip, 
-                                                  :keypair => keypair
-                                                ) }
+        vmx_hash.map do |vmx_file, ip|          
+          VmwareInstance.new( {:vmx_file  => vmx_file, 
+                               :public_ip => ip,
+                               :ip        => ip,
+                               :keypair   => keypair
+                              }.merge(o) )
+        end || {}
+        # output = run_local "#{path_to_binary} list"
+        # lines = output.split("\n")
+        # lines.shift
+        # lines.map {|vmx_file|
+        #   VmwareInstance.new( {:vmx_file  => vmx_file, 
+        #                        :public_ip => ip(vmx_file),
+        #                        :ip        => ip(vmx_file),
+        #                        :keypair   => keypair
+        #                       }.merge(o) )
+        # }
       end
       
       # vmrun specific methods
@@ -144,15 +162,15 @@ module PoolParty
         running_instances.last.vmx_file
       end
       
-      def id(vfile)
-        vmx_file(vfile)
-      end
-      
       ## method's to override default RemoteInstance
       def instance_id
         vmx_file
       end
       
+      def keypair
+        cloud.keypair_name
+      end
+      
       def ip(vmx_file_string=nil)
         return dsl_options[:ip] if dsl_options[:ip]
         vmx_file_string ? vmx_hash[vmx_file_string] : nil

data/lib/poolparty/net/remoter_bases/vmrun/vmrun_instance.rb

@@ -1,35 +1,34 @@
-module PoolParty  
+module PoolParty
   module Remote
     
-    class VmwareInstance
-      attr_reader :ip, :mac_address, :vmx_file, :keypair, :cloud
+    class VmwareInstance < RemoteInstance
+      include ::PoolParty::Pinger
       
-      def initialize(o={}, cld=nil)
+      dsl_methods :mac_address, :vmx_file, :keypair
+      
+      def initialize(o={})
         raise "You must pass a vmx_file" unless o[:vmx_file]
         @vmx_file = ::File.expand_path(o[:vmx_file])
-        @ip = o[:ip]
-        @keypair = o[:keypair]
-        
-        @cloud = cld
+        # o.delete(:status)
+        super o
       end
       
       def to_hash
-        { :status => status,
-          :mac_address => mac_address,
-          :ip => ip,
-          :public_ip => ip,
-          :internal_ip => ip, 
-          :instance_id => vmx_file,
-          :vmx_file => vmx_file,
-          :keypair => keypair
+        { :status       => status,
+          :mac_address  => mac_address,
+          :ip           => ip,
+          :public_ip    => ip,
+          :internal_ip  => ip, 
+          :instance_id  => vmx_file,
+          :vmx_file     => vmx_file,
+          :keypair      => keypair
         }
       end
-      def []k
-        to_hash[k]
-      end
+      
       def status
-        "running"
-      end      
+        ping_port(ip, 22, 1) ? "running" : "terminated"
+      end
+      
       # Is this instance running?
       def running?
         true
@@ -46,30 +45,39 @@ module PoolParty
       def terminated?
         false
       end
+      
       def launch!
         Vmrun.run_local("#{Vmrun.path_to_binary} start \"#{vmx_file}\"")
         dputs "Launched new vmware instance from vmx: #{vmx_file}"
         to_hash
       end
+      
       def terminate!(o)
         Vmrun.run_local("#{Vmrun.path_to_binary} stop \"#{vmx_file}\" #{o}")
       end
+      
       # Get the ip from the arp -a
       # def ip
       #   @ip ||= %x[arp -a].select {|a| a if a =~ /#{mac_address.macify}/}.first[/(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/]
       # end
       # Get the mac address in the vmx_file
-      def mac_address
-        @mac_address ||= parse_vmx_file[:"ethernet0.generatedAddress"]
+      def mac_address(mac=nil)
+        if mac.nil?
+          dsl_options[:mac_address] ||= parse_vmx_file[:"ethernet0.generatedAddress"]
+        else
+          dsl_options[:mac_address] = mac
+        end
       end
+      
       def parse_vmx_file
         vmx_data.to_hash
       end
+      
       def vmx_data
         @vmx_data ||= open(vmx_file).read
       end
       
-    end    
+    end
     
   end
 end

data/lib/poolparty/plugins/apache2/apache.rb

@@ -36,7 +36,7 @@ default host.
       def installed_as_worker
         unless @installed_as_worker
           has_package("apache2")
-          has_package("apache2-mpm-worker")
+          # has_package("apache2-mpm-worker")
 
           base_install
           @installed_as_worker = true

data/lib/poolparty/plugins/chef/chef.rb

@@ -1,28 +1,14 @@
+$:.unshift(::File.dirname(__FILE__))
 require "tempfile"
+require "chef_deploy"
+require "chef_library"
+require "chef_recipe"
+require "include_chef_recipe"
+
 # BIG TODO: Slim the place where the content is gathered from
 module PoolParty
-
-  class ::PoolParty::Resources::ChefRecipe < ::PoolParty::Resources::Resource
-    dsl_methods :recipes
-  end
-  
-  class ::PoolParty::Resources::ChefLibrary < ::PoolParty::Resources::Resource
-  end
-    
-  module Plugin
-  # class ChefRecipe
-  #   include Dslify
-  #   dsl_methods :recipes
-  # end
       
-    class IncludeChefRecipe < Plugin
-      def loaded(opts={}, &block)
-        has_chef_recipe ::File.basename(name)
-      end
-      def before_configure
-        ::Suitcase::Zipper.add(name, "chef/cookbooks") if ::File.exist?(name)
-      end
-    end
+  module Plugin
     
     class Chef < Plugin
       def before_load(o, &block)
@@ -93,11 +79,11 @@ module PoolParty
           end
         else
           unless @recipe
-            @recipe = has_chef_recipe "poolparty", &block
-            @recipe.instance_eval(&block) if block
-            @recipe.recipes(recipe_files.empty? ? ["poolparty"] : ["poolparty", "main"])
-            
-            ::Suitcase::Zipper.add_content_as(@recipe.dsl_options.to_json, "dna.json", "chef")
+            # @recipe = has_chef_recipe "poolparty", &block
+            # @recipe.instance_eval(&block) if block
+            # @recipe.recipes(recipe_files.empty? ? ["poolparty"] : ["poolparty", "main"])
+            dna_content = recipe_files.empty? ? ["poolparty"] : ["poolparty", "main"]
+            ::Suitcase::Zipper.add_content_as({:recipes => dna_content}.to_json, "dna.json", "chef")
             
             configure_commands ["cp -f /var/poolparty/dr_configure/chef/dna.json /etc/chef/dna.json"]
           end

data/lib/poolparty/plugins/chef/chef_deploy.rb

@@ -15,30 +15,13 @@
   end
   
 =end
+require "chef_deploy_definition"
+
 module PoolParty
   module Plugin
     
     class ChefDeploy < Plugin
       
-      define_resource :chef_deploy_definition do
-        
-        dsl_methods :repo
-        
-        default_options(
-                        :branch => "HEAD",
-                        :enable_submodules => true,
-                        :migrate => true,
-                        :environment => "production",
-                        :shallow_clone => true,
-                        :user => "www-data",
-                        :restart_command => "touch tmp/restart.txt",
-                        :migration_command => "rake db:migrate"
-                        )
-        def present
-          :deploy
-        end
-      end
-      
       dsl_methods :branch, :enable_submodules, :migrate, :environment, :shallow_clone, :user,
                   :restart_command, :migration_command, :repo
       
@@ -48,17 +31,16 @@ module PoolParty
         else
           raise ::ReposMissingError.new unless repo
           has_chef_library "chef-deploy/lib/chef-deploy.rb"
-          has_chef_deploy_definition(dsl_options)
+          has_chef_deploy_definition(default_options.merge(:to => name))
         end
       end
       
       def before_configure
         configure_commands [
           "mkdir -p /etc/chef/lib",
-          "cp -R /var/poolparty/dr_configure/etc/chef/lib /etc/chef"
+          "if [ -d /var/poolparty/dr_configure/etc/chef/lib ] ; then cp -R /var/poolparty/dr_configure/etc/chef/lib /etc/chef; fi"
         ]
-        ::Suitcase::Zipper.add("#{::File.dirname(__FILE__)}/../../../vendor/chef/chef-deploy", 
-                                "etc/chef/lib")
+        ::Suitcase::Zipper.add("#{::File.dirname(__FILE__)}/../../../../vendor/chef/chef-deploy", "etc/chef/lib")
       end
       
     end

data/lib/poolparty/plugins/chef/chef_deploy_definition.rb

@@ -0,0 +1,32 @@
+module PoolParty
+  module Resources
+    class ChefDeployDefinition < Resource
+      
+      dsl_methods :repo
+
+      default_options(
+                      :branch => "HEAD",
+                      :enable_submodules => true,
+                      :migrate => true,
+                      :environment => "production",
+                      :shallow_clone => true,
+                      :user => "www-data",
+                      :restart_command => "touch tmp/restart.txt",
+                      :migration_command => "rake db:migrate"
+                      )
+      
+      def to_properties_hash
+        {:pp_type => "deploy", :name => "#{to}"}.merge!(default_options)
+      end
+      
+      def to(n=nil)
+        @to ||= n.nil? ? "/var/www" : n
+      end
+                      
+      def present
+        :deploy
+      end
+      
+    end
+  end
+end

data/lib/poolparty/plugins/chef/chef_library.rb

@@ -0,0 +1,7 @@
+module PoolParty
+  module Resources
+    class ChefLibrary < Resource
+      dsl_methods :recipes
+    end
+  end
+end

data/lib/poolparty/plugins/chef/chef_recipe.rb

@@ -0,0 +1,7 @@
+module PoolParty
+  module Resources
+    class ChefRecipe < Resource
+      dsl_methods :recipes
+    end
+  end
+end

data/lib/poolparty/plugins/chef/include_chef_recipe.rb

@@ -0,0 +1,14 @@
+module PoolParty
+  module Plugin
+
+    class IncludeChefRecipe < Plugin
+      def loaded(opts={}, &block)
+        has_chef_recipe ::File.basename(name)
+      end
+      def before_configure
+        ::Suitcase::Zipper.add(name, "chef/cookbooks") if ::File.exist?(name)
+      end
+    end
+    
+  end
+end