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

Merge pull request #15443 from rallytime/fix_salt_cloud

Browse Source 
Remove remote_exists function and add allow_failure=True
This commit is contained in:
Colton Myers 2014-09-02 14:09:14 -06:00
commit 582565a739
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/utils/cloud.py
View File

@ -964,9 +964,6 @@ def deploy_script(host,
display_ssh_output=display_ssh_output,
gateway=gateway, known_hosts_file=known_hosts_file):
def remote_exists(path):
return not root_cmd('test -e \\"{0}\\"'.format(path),
tty, sudo, allow_failure=True, **kwargs)
log.debug(
'Logging into {0}:{1} as {2}'.format(
host, port, username
@ -992,7 +989,8 @@ def deploy_script(host,
log.debug('Using {0} as the password'.format(password))
kwargs['password'] = password
if not remote_exists(tmp_dir):
if root_cmd('test -e \\"{0}\\"'.format(tmp_dir), tty, sudo,
allow_failure=True, **kwargs):
ret = root_cmd(('sh -c "( mkdir -p \\"{0}\\" &&'
' chmod 700 \\"{0}\\" )"').format(tmp_dir),
tty, sudo, **kwargs)