saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #45444 from rallytime/bp-45343

Browse source 
Back-port #45343 to 2017.7
This commit is contained in:
Nicole Thomas 2018-01-17 12:17:58 -05:00 • committed by GitHub
commit e1403b6813
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
salt/runners/manage.py
View file

@ -67,6 +67,15 @@ def _ping(tgt, tgt_type, timeout, gather_job_timeout):
return returned, not_returned
def _warn_expr_form():
salt.utils.warn_until(
'Fluorine',
'the target type should be passed using the \'tgt_type\' '
'argument instead of \'expr_form\'. Support for using '
'\'expr_form\' will be removed in Salt Fluorine.'
)
def status(output=True, tgt='*', tgt_type='glob', expr_form=None, timeout=None, gather_job_timeout=None):
'''
.. versionchanged:: 2017.7.0
@ -86,12 +95,7 @@ def status(output=True, tgt='*', tgt_type='glob', expr_form=None, timeout=None,
# remember to remove the expr_form argument from this function when
# performing the cleanup on this deprecation.
if expr_form is not None:
salt.utils.warn_until(
'Fluorine',
'the target type should be passed using the \'tgt_type\' '
'argument instead of \'expr_form\'. Support for using '
'\'expr_form\' will be removed in Salt Fluorine.'
)
_warn_expr_form()
tgt_type = expr_form
ret = {}
@ -175,6 +179,12 @@ def down(removekeys=False, tgt='*', tgt_type='glob', expr_form=None):
salt-run manage.down tgt="webservers" tgt_type="nodegroup"
'''
# remember to remove the expr_form argument from this function when
# performing the cleanup on this deprecation.
if expr_form is not None:
_warn_expr_form()
tgt_type = expr_form
ret = status(output=False, tgt=tgt, tgt_type=tgt_type).get('down', [])
for minion in ret:
if removekeys:
@ -199,6 +209,12 @@ def up(tgt='*', tgt_type='glob', expr_form=None, timeout=None, gather_job_timeou
salt-run manage.up tgt="webservers" tgt_type="nodegroup"
salt-run manage.up timeout=5 gather_job_timeout=10
'''
# remember to remove the expr_form argument from this function when
# performing the cleanup on this deprecation.
if expr_form is not None:
_warn_expr_form()
tgt_type = expr_form
ret = status(
output=False,
tgt=tgt,
@ -593,6 +609,12 @@ def safe_accept(target, tgt_type='glob', expr_form=None):
salt-run manage.safe_accept my_minion
salt-run manage.safe_accept minion1,minion2 tgt_type=list
'''
# remember to remove the expr_form argument from this function when
# performing the cleanup on this deprecation.
if expr_form is not None:
_warn_expr_form()
tgt_type = expr_form
salt_key = salt.key.Key(__opts__)
ssh_client = salt.client.ssh.client.SSHClient()