Skip to content

Commit

Permalink
moved mods split to method.
Browse files Browse the repository at this point in the history
  • Loading branch information
bmiguel-teixeira committed Oct 3, 2018
1 parent d6837d7 commit 7be3ada
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions salt/client/ssh/wrapper/state.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,16 @@ def _cleanup_slsmod_high_data(high_data):
stateconf_data['slsmod'] = None


def _parse_mods(mods):
'''
Parse modules.
'''
if isinstance(mods, six.string_types):
mods = [item.strip() for item in mods.split(',') if item.strip()]

return mods


def sls(mods, saltenv='base', test=None, exclude=None, **kwargs):
'''
Create the seed file for a state.sls run
Expand All @@ -181,8 +191,7 @@ def sls(mods, saltenv='base', test=None, exclude=None, **kwargs):
__salt__,
__context__['fileclient'])
st_.push_active()
if isinstance(mods, six.string_types):
mods = [item.strip() for item in mods.split(',')]
mods = _parse_mods(mods)
high_data, errors = st_.render_highstate({saltenv: mods})
if exclude:
if isinstance(exclude, six.string_types):
Expand Down Expand Up @@ -922,8 +931,7 @@ def sls_id(id_, mods, test=None, queue=False, **kwargs):
err += __pillar__['_errors']
return err

if isinstance(mods, six.string_types):
split_mods = [item.strip() for item in mods.split(',')]
split_mods = _parse_mods(mods)
st_.push_active()
high_, errors = st_.render_highstate({opts['saltenv']: split_mods})
errors += st_.state.verify_high(high_)
Expand Down Expand Up @@ -980,8 +988,7 @@ def show_sls(mods, saltenv='base', test=None, **kwargs):
__salt__,
__context__['fileclient'])
st_.push_active()
if isinstance(mods, six.string_types):
mods = [item.strip() for item in mods.split(',')]
mods = _parse_mods(mods)
high_data, errors = st_.render_highstate({saltenv: mods})
high_data, ext_errors = st_.state.reconcile_extend(high_data)
errors += ext_errors
Expand Down Expand Up @@ -1025,8 +1032,7 @@ def show_low_sls(mods, saltenv='base', test=None, **kwargs):
__salt__,
__context__['fileclient'])
st_.push_active()
if isinstance(mods, six.string_types):
mods = [item.strip() for item in mods.split(',')]
mods = _parse_mods(mods)
high_data, errors = st_.render_highstate({saltenv: mods})
high_data, ext_errors = st_.state.reconcile_extend(high_data)
errors += ext_errors
Expand Down

0 comments on commit 7be3ada

Please sign in to comment.