valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add snapper pre and post to state.sls

Browse Source
This commit is contained in:
Thomas S Hatch 2016-08-11 14:57:22 -06:00
parent b570613f04
commit b614c3b511
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
salt/modules/state.py
View File

@ -951,7 +951,6 @@ def sls(mods,
__opts__['cachedir'],
'{0}.cache.p'.format(kwargs.get('cache_name', 'highstate'))
)
try:
st_ = salt.state.HighState(opts,
pillar,
@ -995,6 +994,15 @@ def sls(mods,
high_['__exclude__'].extend(exclude)
else:
high_['__exclude__'] = exclude
snapper_pre = None
if not opts['test'] and __opts__.get('snapper_states'):
# Run the snapper pre snapshot
jid = kwargs.get('__pub_jid', 'called localy')
snapper_pre = __salt__['snapper.create_snapshot'](
config=__opts__.get('snapper_states_config', 'root'),
snapshot_type='pre',
description='Salt State run for jid {0}'.format(jid),
__pub_jid=jid)
ret = st_.state.call_high(high_, orchestration_jid)
finally:
st_.pop_active()
@ -1027,6 +1035,15 @@ def sls(mods,
msg = 'Unable to write to highstate cache file {0}. Do you have permissions?'
log.error(msg.format(cfn))
os.umask(cumask)
if not opts['test'] and __opts__.get('snapper_states') and snapper_pre:
# Run the snapper pre snapshot
jid = kwargs.get('__pub_jid', 'called localy')
snapper_pre = __salt__['snapper.create_snapshot'](
config=__opts__.get('snapper_states_config', 'root'),
snapshot_type='post',
pre_number=snapper_pre,
description='Salt State run for jid {0}'.format(jid),
__pub_jid=jid)
return ret