Install a virtualenv for OSQA

[chef.git] / cookbooks / python / resources / package.rb

diff --git a/cookbooks/python/resources/package.rb b/cookbooks/python/resources/package.rb
index 4a3cb9f0141a100954dedb838cd2f5ea67afa9f9..fb9cf09bd3fac8fabba6dc9d66a3475cf57d84bc 100644 (file)
--- a/cookbooks/python/resources/package.rb
+++ b/cookbooks/python/resources/package.rb
@@ -22,6 +22,7 @@ default_action :install
 property :package_name, :kind_of => String, :name_property => true
 property :version, :kind_of => String
 property :python_version, :kind_of => String
 property :package_name, :kind_of => String, :name_property => true
 property :version, :kind_of => String
 property :python_version, :kind_of => String

+property :python_virtualenv, :kind_of => String

 
 action :install do
   if new_resource.version.nil?
 
 action :install do
   if new_resource.version.nil?


@@ -46,6 +47,10 @@ end
 
 action_class do
   def pip_command
 
 action_class do
   def pip_command

-    "pip#{new_resource.python_version}"
+    if new_resource.python_virtualenv
+      "#{new_resource.python_virtualenv}/bin/pip"
+    else
+      "pip#{new_resource.python_version}"
+    end

   end
 end
   end
 end