about summary refs log tree commit diff
path: root/nixos/modules/virtualisation
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-06-30 17:25:30 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-06-30 17:25:56 +0200
commit96b325b0b7d2fab8ea8ec8e06f2e8868d5f45d8b (patch)
tree4204ca777bf5281340120d1b35a10e095a1b4553 /nixos/modules/virtualisation
parent433a13d12aa4f97bb003ea5561758ff5858d632a (diff)
Remove option ec2.metadata
Diffstat (limited to 'nixos/modules/virtualisation')
-rw-r--r--nixos/modules/virtualisation/amazon-init.nix1
-rw-r--r--nixos/modules/virtualisation/ec2-data.nix10
2 files changed, 0 insertions, 11 deletions
diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix
index 6058a7019e843..21cbbfda0b68f 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 cc641b1a98700..44a582ba76667 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" =