Move amazon option out of amazon-image.nix, needed to make ec2.hvm usable from nixops, without breaking evaluation for other backends.

(cherry picked from commit 213fe8427c5ce455b893c0c5c56cc38175bf36b7)
2015-02-16 09:57:19 +00:00
parent 85e2076a0b
commit 824fccd3e9
3 changed files with 17 additions and 12 deletions
@@ -7,17 +7,6 @@ in
 {
  imports = [ ../profiles/headless.nix ./ec2-data.nix ];

-  options = {
-    ec2 = {
-      hvm = mkOption {
-        default = false;
-        description = ''
-          Whether the EC2 instance is a HVM instance.
-        '';
-      };
-    };
-  };
-
  config = {
    system.build.amazonImage =
      pkgs.vmTools.runInLinuxVM (