about summary refs log tree commit diff
path: root/nixos/modules/virtualisation
diff options
context:
space:
mode:
authorRob Vermaas <rob.vermaas@gmail.com>2018-01-18 13:06:00 +0100
committerGitHub <noreply@github.com>2018-01-18 13:06:00 +0100
commit38538f32069fa940381e49e3e393116feef42319 (patch)
tree46e600cfc380e1563ebfb4e2e8d5c8020bbe1c10 /nixos/modules/virtualisation
parentaee7a0e928212c3b092632cab7a083da49dca18d (diff)
parent5dba59d494b12c9f759fb7b01859d45e597a049b (diff)
downloadnixlib-38538f32069fa940381e49e3e393116feef42319.tar
nixlib-38538f32069fa940381e49e3e393116feef42319.tar.gz
nixlib-38538f32069fa940381e49e3e393116feef42319.tar.bz2
nixlib-38538f32069fa940381e49e3e393116feef42319.tar.lz
nixlib-38538f32069fa940381e49e3e393116feef42319.tar.xz
nixlib-38538f32069fa940381e49e3e393116feef42319.tar.zst
nixlib-38538f32069fa940381e49e3e393116feef42319.zip
Merge pull request #33423 from AmineChikhaoui/gce-ssh-keys
Fix ssh keys retrieval in GCE instances
Diffstat (limited to 'nixos/modules/virtualisation')
-rw-r--r--nixos/modules/virtualisation/google-compute-image.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 75717e08ab2a..2fb38059b261 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -212,7 +212,7 @@ in
           echo "Obtaining SSH keys..."
           mkdir -m 0700 -p /root/.ssh
           AUTH_KEYS=$(${mktemp})
-          ${wget} -O $AUTH_KEYS http://metadata.google.internal/computeMetadata/v1/project/attributes/sshKeys
+          ${wget} -O $AUTH_KEYS --header="Metadata-Flavor: Google" http://metadata.google.internal/computeMetadata/v1/instance/attributes/sshKeys
           if [ -s $AUTH_KEYS ]; then
 
             # Read in key one by one, split in case Google decided