mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 17:33:54 +00:00
Remove runas from virtuenv_mod because it's deprecated now
This commit is contained in:
parent
27b7cdae90
commit
75c3b2f727
@ -35,7 +35,6 @@ def managed(name,
|
||||
never_download=None,
|
||||
prompt=None,
|
||||
user=None,
|
||||
runas=None,
|
||||
no_chown=False,
|
||||
cwd=None,
|
||||
index_url=None,
|
||||
@ -83,29 +82,6 @@ def managed(name,
|
||||
ret['comment'] = 'Virtualenv was not detected on this system'
|
||||
return ret
|
||||
|
||||
if runas:
|
||||
# Warn users about the deprecation
|
||||
salt.utils.warn_until(
|
||||
'Lithium',
|
||||
'The support for \'runas\' is being deprecated in favor of '
|
||||
'\'user\' and will be removed in Salt Beryllium. Please update '
|
||||
'your state files.'
|
||||
)
|
||||
if user is not None and runas is not None:
|
||||
# user wins over runas but let warn about the deprecation.
|
||||
salt.utils.warn_until(
|
||||
'Lithium',
|
||||
'Passed both the \'runas\' and \'user\' arguments. \'runas\' is '
|
||||
'being ignored in favor of \'user\' as the support for \'runas\' '
|
||||
'is being deprecated in favor of \'user\' and will be removed in '
|
||||
'Salt Beryllium. Please update your state files.'
|
||||
)
|
||||
runas = None
|
||||
elif runas is not None:
|
||||
# Support old runas usage
|
||||
user = runas
|
||||
runas = None
|
||||
|
||||
if salt.utils.is_windows():
|
||||
venv_py = os.path.join(name, 'Scripts', 'python.exe')
|
||||
else:
|
||||
|
Loading…
Reference in New Issue
Block a user