mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Mike Place
commit
35fc74132a
2 changed files with 54 additions and 64 deletions
|
|
@ -1442,8 +1442,8 @@ def build(path=None,
|
|||
|
||||
except Exception:
|
||||
_invalid(status,
|
||||
out=traceback.format_exc(),
|
||||
comment='Unexpected error while building an image')
|
||||
out=traceback.format_exc(),
|
||||
comment='Unexpected error while building an image')
|
||||
return status
|
||||
|
||||
return status
|
||||
|
|
@ -1819,16 +1819,13 @@ def _run_wrapper(status, container, func, cmd, *args, **kwargs):
|
|||
try:
|
||||
f = __salt__[func]
|
||||
ret = f(full_cmd, *args, **kwargs)
|
||||
if ((isinstance(ret, dict) and
|
||||
('retcode' in ret) and
|
||||
(ret['retcode'] != 0))
|
||||
or (func == 'cmd.retcode' and ret != 0)):
|
||||
return _invalid(status, id_=container, out=ret,
|
||||
comment=comment)
|
||||
_valid(status, id_=container, out=ret, comment=comment,)
|
||||
if ((isinstance(ret, dict) and ('retcode' in ret) and (ret['retcode'] != 0))
|
||||
or (func == 'cmd.retcode' and ret != 0)):
|
||||
_invalid(status, id_=container, out=ret, comment=comment)
|
||||
else:
|
||||
_valid(status, id_=container, out=ret, comment=comment)
|
||||
except Exception:
|
||||
_invalid(status, id_=container,
|
||||
comment=comment, out=traceback.format_exc())
|
||||
_invalid(status, id_=container, comment=comment, out=traceback.format_exc())
|
||||
return status
|
||||
|
||||
|
||||
|
|
@ -1853,9 +1850,7 @@ def load(imagepath):
|
|||
try:
|
||||
dockercmd = ['docker', 'load', '-i', imagepath]
|
||||
ret = __salt__['cmd.run'](dockercmd, python_shell=False)
|
||||
if ((isinstance(ret, dict) and
|
||||
('retcode' in ret) and
|
||||
(ret['retcode'] != 0))):
|
||||
if isinstance(ret, dict) and ('retcode' in ret) and (ret['retcode'] != 0):
|
||||
return _invalid(status, id_=None,
|
||||
out=ret,
|
||||
comment='Command to load image {0} failed.'.format(imagepath))
|
||||
|
|
@ -1863,12 +1858,12 @@ def load(imagepath):
|
|||
_valid(status, id_=None, out=ret, comment='Image load success')
|
||||
except Exception:
|
||||
_invalid(status, id_=None,
|
||||
comment="Image not loaded.",
|
||||
out=traceback.format_exc())
|
||||
comment="Image not loaded.",
|
||||
out=traceback.format_exc())
|
||||
else:
|
||||
_invalid(status, id_=None,
|
||||
comment='Image file {0} could not be found.'.format(imagepath),
|
||||
out=traceback.format_exc())
|
||||
comment='Image file {0} could not be found.'.format(imagepath),
|
||||
out=traceback.format_exc())
|
||||
|
||||
return status
|
||||
|
||||
|
|
@ -1899,16 +1894,14 @@ def save(image, filename):
|
|||
ok = True
|
||||
except Exception:
|
||||
_invalid(status, id_=image,
|
||||
comment="docker image {0} could not be found.".format(image),
|
||||
out=traceback.format_exc())
|
||||
comment="docker image {0} could not be found.".format(image),
|
||||
out=traceback.format_exc())
|
||||
|
||||
if ok:
|
||||
try:
|
||||
dockercmd = ['docker', 'save', '-o', filename, image]
|
||||
ret = __salt__['cmd.run'](dockercmd)
|
||||
if ((isinstance(ret, dict) and
|
||||
('retcode' in ret) and
|
||||
(ret['retcode'] != 0))):
|
||||
if isinstance(ret, dict) and ('retcode' in ret) and (ret['retcode'] != 0):
|
||||
return _invalid(status,
|
||||
id_=image,
|
||||
out=ret,
|
||||
|
|
@ -2053,9 +2046,7 @@ def retcode(container, cmd):
|
|||
command to execute
|
||||
|
||||
.. note::
|
||||
The return is a bit different as we use the docker struct.
|
||||
Output of the command is in 'out' and result is ``False`` if
|
||||
command failed to execute.
|
||||
The return is True or False depending on the commands success.
|
||||
|
||||
.. warning::
|
||||
Be advised that this function allows for raw shell access to the named
|
||||
|
|
@ -2070,7 +2061,7 @@ def retcode(container, cmd):
|
|||
'''
|
||||
status = base_status.copy()
|
||||
return _run_wrapper(
|
||||
status, container, 'cmd.retcode', cmd)
|
||||
status, container, 'cmd.retcode', cmd)['status']
|
||||
|
||||
|
||||
def get_container_root(container):
|
||||
|
|
|
|||
|
|
@ -274,8 +274,8 @@ def _parse_volumes(volumes):
|
|||
contvolumes.append(str(vol))
|
||||
continue
|
||||
bindvolumes[source] = {
|
||||
'bind': target,
|
||||
'ro': read_only
|
||||
'bind': target,
|
||||
'ro': read_only
|
||||
}
|
||||
result = {'bindvols': bindvolumes, 'contvols': contvolumes}
|
||||
log.trace("Finished parsing volumes, with result: " + str(result))
|
||||
|
|
@ -460,9 +460,9 @@ def loaded(name, source=None, source_hash='', force=False):
|
|||
|
||||
tmp_filename = salt.utils.mkstemp()
|
||||
__salt__['state.single']('file.managed',
|
||||
name=tmp_filename,
|
||||
source=source,
|
||||
source_hash=source_hash)
|
||||
name=tmp_filename,
|
||||
source=source,
|
||||
source_hash=source_hash)
|
||||
changes = {}
|
||||
|
||||
if image_infos['status']:
|
||||
|
|
@ -471,7 +471,7 @@ def loaded(name, source=None, source_hash='', force=False):
|
|||
remove_info = remove_image(name)
|
||||
if not remove_info['status']:
|
||||
return _invalid(name=name,
|
||||
comment='Image could not be removed: {0}'.format(name))
|
||||
comment='Image could not be removed: {0}'.format(name))
|
||||
|
||||
load = __salt__['docker.load']
|
||||
returned = load(tmp_filename)
|
||||
|
|
@ -686,23 +686,23 @@ def absent(name):
|
|||
is_gone = __salt__['docker.exists'](cid)
|
||||
if is_gone:
|
||||
return _valid(comment=('Container {0!r}'
|
||||
' was stopped and destroyed, '.format(cid)),
|
||||
changes={name: True})
|
||||
' was stopped and destroyed, '.format(cid)),
|
||||
changes={name: True})
|
||||
else:
|
||||
return _valid(comment=('Container {0!r}'
|
||||
' was stopped but could not be destroyed,'.format(cid)),
|
||||
changes={name: True})
|
||||
' was stopped but could not be destroyed,'.format(cid)),
|
||||
changes={name: True})
|
||||
else:
|
||||
__salt__['docker.remove_container'](cid)
|
||||
is_gone = __salt__['docker.exists'](cid)
|
||||
if is_gone:
|
||||
return _valid(comment=('Container {0!r}'
|
||||
' is stopped and was destroyed, '.format(cid)),
|
||||
changes={name: True})
|
||||
'is stopped and was destroyed, '.format(cid)),
|
||||
changes={name: True})
|
||||
else:
|
||||
return _valid(comment=('Container {0!r}'
|
||||
' is stopped but could not be destroyed,'.format(cid)),
|
||||
changes={name: True})
|
||||
' is stopped but could not be destroyed,'.format(cid)),
|
||||
changes={name: True})
|
||||
else:
|
||||
return _valid(comment="Container {0!r} not found".format(name))
|
||||
|
||||
|
|
@ -788,7 +788,7 @@ def run(name,
|
|||
if not onlyif:
|
||||
return valid(comment='onlyif execution failed')
|
||||
elif isinstance(onlyif, string_types):
|
||||
if retcode(cid, onlyif) != 0:
|
||||
if not __salt__['cmd.retcode'](onlyif) == 0:
|
||||
return valid(comment='onlyif execution failed')
|
||||
|
||||
if unless is not None:
|
||||
|
|
@ -796,7 +796,7 @@ def run(name,
|
|||
if unless:
|
||||
return valid(comment='unless execution succeeded')
|
||||
elif isinstance(unless, string_types):
|
||||
if retcode(cid, unless) == 0:
|
||||
if __salt__['cmd.retcode'](unless) == 0:
|
||||
return valid(comment='unless execution succeeded')
|
||||
|
||||
if docked_onlyif is not None:
|
||||
|
|
@ -804,7 +804,7 @@ def run(name,
|
|||
if not docked_onlyif:
|
||||
return valid(comment='docked_onlyif execution failed')
|
||||
elif isinstance(docked_onlyif, string_types):
|
||||
if retcode(cid, docked_onlyif) != 0:
|
||||
if not retcode(cid, docked_onlyif):
|
||||
return valid(comment='docked_onlyif execution failed')
|
||||
|
||||
if docked_unless is not None:
|
||||
|
|
@ -812,8 +812,9 @@ def run(name,
|
|||
if docked_unless:
|
||||
return valid(comment='docked_unless execution succeeded')
|
||||
elif isinstance(docked_unless, string_types):
|
||||
if retcode(cid, docked_unless) == 0:
|
||||
if retcode(cid, docked_unless):
|
||||
return valid(comment='docked_unless execution succeeded')
|
||||
# run only if the above did not bail
|
||||
result = drun_all(cid, name)
|
||||
if result['status']:
|
||||
return valid(comment=result['comment'])
|
||||
|
|
@ -1061,21 +1062,21 @@ def running(name,
|
|||
|
||||
if not already_exists:
|
||||
args, kwargs = [image], dict(
|
||||
command=command,
|
||||
hostname=hostname,
|
||||
user=user,
|
||||
detach=detach,
|
||||
stdin_open=stdin_open,
|
||||
tty=tty,
|
||||
mem_limit=mem_limit,
|
||||
ports=exposeports,
|
||||
environment=denvironment,
|
||||
dns=dns,
|
||||
binds=bindvolumes,
|
||||
volumes=contvolumes,
|
||||
name=name,
|
||||
cpu_shares=cpu_shares,
|
||||
cpuset=cpuset)
|
||||
command=command,
|
||||
hostname=hostname,
|
||||
user=user,
|
||||
detach=detach,
|
||||
stdin_open=stdin_open,
|
||||
tty=tty,
|
||||
mem_limit=mem_limit,
|
||||
ports=exposeports,
|
||||
environment=denvironment,
|
||||
dns=dns,
|
||||
binds=bindvolumes,
|
||||
volumes=contvolumes,
|
||||
name=name,
|
||||
cpu_shares=cpu_shares,
|
||||
cpuset=cpuset)
|
||||
out = create(*args, **kwargs)
|
||||
# if container has been created, even if not started, we mark
|
||||
# it as installed
|
||||
|
|
@ -1108,10 +1109,8 @@ def running(name,
|
|||
if is_running:
|
||||
changes.append('Container {0!r} started.\n'.format(name))
|
||||
else:
|
||||
return _invalid(
|
||||
comment=(
|
||||
'Container {0!r} cannot be started\n{1!s}'
|
||||
.format(name, started['out'],)))
|
||||
return _invalid(comment=('Container {0!r} cannot be started\n{1!s}'
|
||||
.format(name, started['out'],)))
|
||||
else:
|
||||
changes.append('Container {0!r} started.\n'.format(name))
|
||||
return _valid(comment=','.join(changes), changes={name: True})
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue