diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-30 17:25:30 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-30 17:25:56 +0200 |
| commit | 96b325b0b7d2fab8ea8ec8e06f2e8868d5f45d8b (patch) | |
| tree | 4204ca777bf5281340120d1b35a10e095a1b4553 /nixos | |
| parent | 433a13d12aa4f97bb003ea5561758ff5858d632a (diff) | |
| download | nixlib-96b325b0b7d2fab8ea8ec8e06f2e8868d5f45d8b.tar nixlib-96b325b0b7d2fab8ea8ec8e06f2e8868d5f45d8b.tar.gz nixlib-96b325b0b7d2fab8ea8ec8e06f2e8868d5f45d8b.tar.bz2 nixlib-96b325b0b7d2fab8ea8ec8e06f2e8868d5f45d8b.tar.lz nixlib-96b325b0b7d2fab8ea8ec8e06f2e8868d5f45d8b.tar.xz nixlib-96b325b0b7d2fab8ea8ec8e06f2e8868d5f45d8b.tar.zst nixlib-96b325b0b7d2fab8ea8ec8e06f2e8868d5f45d8b.zip | |
Remove option ec2.metadata
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/rename.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/amazon-init.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/ec2-data.nix | 10 |
3 files changed, 1 insertions, 11 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index fc83e7ed590a..dd80d0065911 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -148,5 +148,6 @@ in zipModules ([] ++ obsolete' [ "services" "samba" "defaultShare" ] ++ obsolete' [ "services" "syslog-ng" "serviceName" ] ++ obsolete' [ "services" "syslog-ng" "listenToJournal" ] +++ obsolete' [ "ec2" "metadata" ] ) diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix index 6058a7019e84..21cbbfda0b68 100644 --- a/nixos/modules/virtualisation/amazon-init.nix +++ b/nixos/modules/virtualisation/amazon-init.nix @@ -45,7 +45,6 @@ let ''; in { imports = [ "${modulesPath}/virtualisation/amazon-image.nix" ]; - ec2.metadata = true; boot.postBootCommands = '' ${bootScript} & ''; diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix index cc641b1a9870..44a582ba7666 100644 --- a/nixos/modules/virtualisation/ec2-data.nix +++ b/nixos/modules/virtualisation/ec2-data.nix @@ -7,16 +7,6 @@ with lib; { - options = { - ec2.metadata = mkOption { - type = types.bool; - default = false; - description = '' - Whether to allow access to EC2 metadata. - ''; - }; - }; - config = { systemd.services."fetch-ec2-data" = |