kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 07:26:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #138 from jkaplowitz/development

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bootstrapvz/plugins/google_cloud_sdk/tasks.py
View file

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

1
bootstrapvz/providers/gce/__init__.py
View file

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