diff options
| author | Jack Kelly <jack@jackkelly.name> | 2020-11-21 11:40:38 +1000 |
|---|---|---|
| committer | Jack Kelly <jack@jackkelly.name> | 2020-11-22 11:04:46 +1000 |
| commit | 8c39655de3f0ae5adbbfb3b9c5be412c4c3801d6 (patch) | |
| tree | 716f977b8c4503000afb0c59d9bcc690d9e26809 | |
| parent | f8c3027812718db56b0cbdad137881f44bc1264a (diff) | |
| download | nixpkgs-8c39655de3f0ae5adbbfb3b9c5be412c4c3801d6.tar nixpkgs-8c39655de3f0ae5adbbfb3b9c5be412c4c3801d6.tar.gz nixpkgs-8c39655de3f0ae5adbbfb3b9c5be412c4c3801d6.tar.bz2 nixpkgs-8c39655de3f0ae5adbbfb3b9c5be412c4c3801d6.tar.lz nixpkgs-8c39655de3f0ae5adbbfb3b9c5be412c4c3801d6.tar.xz nixpkgs-8c39655de3f0ae5adbbfb3b9c5be412c4c3801d6.tar.zst nixpkgs-8c39655de3f0ae5adbbfb3b9c5be412c4c3801d6.zip | |
{ec2,openstack}-metadata-fetcher: introduce wget_imds function
| -rw-r--r-- | nixos/modules/virtualisation/ec2-metadata-fetcher.nix | 12 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/openstack-metadata-fetcher.nix | 12 |
2 files changed, 16 insertions, 8 deletions
diff --git a/nixos/modules/virtualisation/ec2-metadata-fetcher.nix b/nixos/modules/virtualisation/ec2-metadata-fetcher.nix index 812e93ec4aa..0b110d375a4 100644 --- a/nixos/modules/virtualisation/ec2-metadata-fetcher.nix +++ b/nixos/modules/virtualisation/ec2-metadata-fetcher.nix @@ -61,19 +61,23 @@ echo "getting EC2 instance metadata..." + wget_imds() { + wget ${wgetExtraOptions} --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" "$@"; + } + if ! [ -e "$metaDir/ami-manifest-path" ]; then - wget ${wgetExtraOptions} --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path + wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path fi if ! [ -e "$metaDir/user-data" ]; then - wget ${wgetExtraOptions} --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data" + wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data" fi if ! [ -e "$metaDir/hostname" ]; then - wget ${wgetExtraOptions} --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname + wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname fi if ! [ -e "$metaDir/public-keys-0-openssh-key" ]; then - wget ${wgetExtraOptions} --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key + wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key fi '' diff --git a/nixos/modules/virtualisation/openstack-metadata-fetcher.nix b/nixos/modules/virtualisation/openstack-metadata-fetcher.nix index b8f78efb98a..2aff8ccd2c2 100644 --- a/nixos/modules/virtualisation/openstack-metadata-fetcher.nix +++ b/nixos/modules/virtualisation/openstack-metadata-fetcher.nix @@ -5,19 +5,23 @@ echo "getting instance metadata..." + wget_imds() { + wget ${wgetExtraOptions} "$@" + } + if ! [ -e "$metaDir/ami-manifest-path" ]; then - wget ${wgetExtraOptions} -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path + wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path fi if ! [ -e "$metaDir/user-data" ]; then - wget ${wgetExtraOptions} -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data" + wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data" fi if ! [ -e "$metaDir/hostname" ]; then - wget ${wgetExtraOptions} -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname + wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname fi if ! [ -e "$metaDir/public-keys-0-openssh-key" ]; then - wget ${wgetExtraOptions} -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key + wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key fi '' |