Merge pull request saltstack#23422 from cro/gce_sh_home

$HOME should not be used, some shells don't set it.
rickyninja · May 6, 2015 · 644eb75 · 644eb75
2 parents ef17ab4 + 4ef9e6b
commit 644eb75
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/salt/cloud/clouds/gce.py b/salt/cloud/clouds/gce.py
@@ -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