Easy_install and pip module support a virtualenv_command parameter.
This allows flexible selection of the Python version to use while creating the virtualenv.
This commit is contained in:
parent
01e66c6687
commit
9f65233e96
2 changed files with 20 additions and 2 deletions
|
@ -48,6 +48,12 @@ options:
|
||||||
created.
|
created.
|
||||||
required: false
|
required: false
|
||||||
default: no
|
default: no
|
||||||
|
virtualenv_command:
|
||||||
|
description:
|
||||||
|
- The command to create the virtual environment with. For example
|
||||||
|
C(pyvenv), C(virtualenv), C(virtualenv2).
|
||||||
|
required: false
|
||||||
|
default: virtualenv
|
||||||
examples:
|
examples:
|
||||||
- code: "easy_install: name=pip"
|
- code: "easy_install: name=pip"
|
||||||
description: "Examples from Ansible Playbooks"
|
description: "Examples from Ansible Playbooks"
|
||||||
|
@ -75,6 +81,7 @@ def main():
|
||||||
name=dict(required=True),
|
name=dict(required=True),
|
||||||
virtualenv=dict(default=None, required=False),
|
virtualenv=dict(default=None, required=False),
|
||||||
virtualenv_site_packages=dict(default='no', choices=BOOLEANS),
|
virtualenv_site_packages=dict(default='no', choices=BOOLEANS),
|
||||||
|
virtualenv_command=dict(default='virtualenv', required=False),
|
||||||
)
|
)
|
||||||
|
|
||||||
module = AnsibleModule(argument_spec=arg_spec)
|
module = AnsibleModule(argument_spec=arg_spec)
|
||||||
|
@ -83,13 +90,14 @@ def main():
|
||||||
env = module.params['virtualenv']
|
env = module.params['virtualenv']
|
||||||
easy_install = module.get_bin_path('easy_install', True, ['%s/bin' % env])
|
easy_install = module.get_bin_path('easy_install', True, ['%s/bin' % env])
|
||||||
site_packages = module.boolean(module.params['virtualenv_site_packages'])
|
site_packages = module.boolean(module.params['virtualenv_site_packages'])
|
||||||
|
virtualenv_command = module.params['virtualenv_command']
|
||||||
|
|
||||||
rc = 0
|
rc = 0
|
||||||
err = ''
|
err = ''
|
||||||
out = ''
|
out = ''
|
||||||
|
|
||||||
if env:
|
if env:
|
||||||
virtualenv = module.get_bin_path('virtualenv', True)
|
virtualenv = module.get_bin_path(virtualenv_command, True)
|
||||||
|
|
||||||
if not os.path.exists(os.path.join(env, 'bin', 'activate')):
|
if not os.path.exists(os.path.join(env, 'bin', 'activate')):
|
||||||
command = '%s %s' % (virtualenv, env)
|
command = '%s %s' % (virtualenv, env)
|
||||||
|
|
12
library/pip
12
library/pip
|
@ -56,6 +56,12 @@ options:
|
||||||
created.
|
created.
|
||||||
required: false
|
required: false
|
||||||
default: no
|
default: no
|
||||||
|
virtualenv_command:
|
||||||
|
description:
|
||||||
|
- The command to create the virtual environment with. For example
|
||||||
|
C(pyvenv), C(virtualenv), C(virtualenv2).
|
||||||
|
required: false
|
||||||
|
default: virtualenv
|
||||||
use_mirrors:
|
use_mirrors:
|
||||||
description:
|
description:
|
||||||
- Whether to use mirrors when installing python libraries. If using
|
- Whether to use mirrors when installing python libraries. If using
|
||||||
|
@ -86,6 +92,8 @@ examples:
|
||||||
description: "Install I(Flask) (U(http://flask.pocoo.org/)) into the specified I(virtualenv), inheriting none of the globally installed modules"
|
description: "Install I(Flask) (U(http://flask.pocoo.org/)) into the specified I(virtualenv), inheriting none of the globally installed modules"
|
||||||
- code: "pip: name=flask virtualenv=/my_app/venv virtualenv_site_packages=yes"
|
- code: "pip: name=flask virtualenv=/my_app/venv virtualenv_site_packages=yes"
|
||||||
description: "Install I(Flask) (U(http://flask.pocoo.org/)) into the specified I(virtualenv), inheriting globally installed modules"
|
description: "Install I(Flask) (U(http://flask.pocoo.org/)) into the specified I(virtualenv), inheriting globally installed modules"
|
||||||
|
- code: "pip: name=flask virtualenv=/my_app/venv virtualenv_command=virtualenv-2.7"
|
||||||
|
description: "Install I(Flask) (U(http://flask.pocoo.org/)) into the specified I(virtualenv), using Python 2.7"
|
||||||
- code: "pip: requirements=/my_app/requirements.txt"
|
- code: "pip: requirements=/my_app/requirements.txt"
|
||||||
description: Install specified python requirements.
|
description: Install specified python requirements.
|
||||||
- code: "pip: requirements=/my_app/requirements.txt virtualenv=/my_app/venv"
|
- code: "pip: requirements=/my_app/requirements.txt virtualenv=/my_app/venv"
|
||||||
|
@ -149,6 +157,7 @@ def main():
|
||||||
requirements=dict(default=None, required=False),
|
requirements=dict(default=None, required=False),
|
||||||
virtualenv=dict(default=None, required=False),
|
virtualenv=dict(default=None, required=False),
|
||||||
virtualenv_site_packages=dict(default='no', choices=BOOLEANS),
|
virtualenv_site_packages=dict(default='no', choices=BOOLEANS),
|
||||||
|
virtualenv_command=dict(default='virtualenv', required=False),
|
||||||
use_mirrors=dict(default='yes', choices=BOOLEANS),
|
use_mirrors=dict(default='yes', choices=BOOLEANS),
|
||||||
extra_args=dict(default=None, required=False),
|
extra_args=dict(default=None, required=False),
|
||||||
),
|
),
|
||||||
|
@ -172,9 +181,10 @@ def main():
|
||||||
out = ''
|
out = ''
|
||||||
|
|
||||||
env = module.params['virtualenv']
|
env = module.params['virtualenv']
|
||||||
|
virtualenv_command = module.params['virtualenv_command']
|
||||||
|
|
||||||
if env:
|
if env:
|
||||||
virtualenv = module.get_bin_path('virtualenv', True)
|
virtualenv = module.get_bin_path(virtualenv_command, True)
|
||||||
if not os.path.exists(os.path.join(env, 'bin', 'activate')):
|
if not os.path.exists(os.path.join(env, 'bin', 'activate')):
|
||||||
if module.boolean(module.params['virtualenv_site_packages']):
|
if module.boolean(module.params['virtualenv_site_packages']):
|
||||||
cmd = '%s --system-site-packages %s' % (virtualenv, env)
|
cmd = '%s --system-site-packages %s' % (virtualenv, env)
|
||||||
|
|
Loading…
Reference in a new issue