mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 17:09:03 +00:00
Merge pull request #23422 from cro/gce_sh_home
$HOME should not be used, some shells don't set it.
This commit is contained in:
commit
644eb75fec
@ -529,7 +529,7 @@ def __get_ssh_credentials(vm_):
|
||||
'ssh_username', vm_, __opts__, default=os.getenv('USER'))
|
||||
ssh_key = config.get_cloud_config_value(
|
||||
'ssh_keyfile', vm_, __opts__,
|
||||
default=os.getenv('HOME') + '/.ssh/google_compute_engine')
|
||||
default=os.path.expanduser('~/.ssh/google_compute_engine'))
|
||||
return ssh_user, ssh_key
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user