Merge pull request #138 from jkaplowitz/development

Fix two issues that were uncovered by GCE's 20140807 image
This commit is contained in:
Anders Ingemann 2014-08-15 16:15:55 -06:00
commit 2628007839
2 changed files with 1 additions and 1 deletions

View file

@ -52,7 +52,6 @@ class InstallCloudSDK(Task):
cloudsdk_directory = os.path.join(info.root, 'usr/local/share/google')
os.makedirs(cloudsdk_directory)
log_check_call(['file', cloudsdk_download_dest, cloudsdk_directory])
log_check_call(['tar', 'xaf', cloudsdk_download_dest, '-C', cloudsdk_directory])
# We need to symlink certain programs from the Cloud SDK bin directory into /usr/local/bin.

View file

@ -40,6 +40,7 @@ def resolve_tasks(taskset, manifest):
tasks.boot.ConfigureGrub,
initd.InstallInitScripts,
ssh.AddSSHKeyGeneration,
ssh.DisableSSHPasswordAuthentication,
tasks.apt.CleanGoogleRepositoriesAndKeys,
loopback.MoveImage,