Merge remote-tracking branch 'github/pull/510'

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

diff --git a/cookbooks/python/resources/virtualenv.rb b/cookbooks/python/resources/virtualenv.rb
index 6ffaccac08b8f6c23c8e77dee6bc55087a710bec..8b13917614daadcdb2ce9d4f4d7fbedd77d0693f 100644 (file)
--- a/cookbooks/python/resources/virtualenv.rb
+++ b/cookbooks/python/resources/virtualenv.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: python
+# Cookbook:: python

 # Resource:: virtualenv
 #
 # Resource:: virtualenv
 #

-# Copyright 2019, OpenStreetMap Foundation
+# Copyright:: 2019, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -17,13 +17,16 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+unified_mode true
+

 default_action :create
 
 property :virtualenv_directory, :kind_of => String, :name_property => true
 default_action :create
 
 property :virtualenv_directory, :kind_of => String, :name_property => true

+property :interpreter, :kind_of => String, :default => "/usr/bin/python"

 
 action :create do
   execute "virtualenv-#{new_resource.virtualenv_directory}" do
 
 action :create do
   execute "virtualenv-#{new_resource.virtualenv_directory}" do

-    command "virtualenv #{new_resource.virtualenv_directory}"
+    command "virtualenv --python=#{new_resource.interpreter} #{new_resource.virtualenv_directory}"

     not_if { ::File.exist?(new_resource.virtualenv_directory) }
   end
 end
     not_if { ::File.exist?(new_resource.virtualenv_directory) }
   end
 end