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" =