diff options
author | Dan Peebles <pumpkin@me.com> | 2015-12-30 04:58:29 +0000 |
---|---|---|
committer | Dan Peebles <pumpkin@me.com> | 2015-12-30 04:59:52 +0000 |
commit | cd7612b8419d6f02884927d56718fd41749fe0a1 (patch) | |
tree | 52186264ad9def4c24b04afc38c663d4feae5d17 /nixos | |
parent | 878544e4f6a9b60cad055e1f1e353d3b956f343a (diff) | |
download | nixpkgs-cd7612b8419d6f02884927d56718fd41749fe0a1.tar nixpkgs-cd7612b8419d6f02884927d56718fd41749fe0a1.tar.gz nixpkgs-cd7612b8419d6f02884927d56718fd41749fe0a1.tar.bz2 nixpkgs-cd7612b8419d6f02884927d56718fd41749fe0a1.tar.lz nixpkgs-cd7612b8419d6f02884927d56718fd41749fe0a1.tar.xz nixpkgs-cd7612b8419d6f02884927d56718fd41749fe0a1.tar.zst nixpkgs-cd7612b8419d6f02884927d56718fd41749fe0a1.zip |
amazon-image: enable configure-from-userdata and the corresponding VM test
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/virtualisation/amazon-image.nix | 2 | ||||
-rw-r--r-- | nixos/modules/virtualisation/amazon-init.nix | 1 | ||||
-rw-r--r-- | nixos/release.nix | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index bf2364a0459..7ccc9df740e 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -11,7 +11,7 @@ with lib; let cfg = config.ec2; in { - imports = [ ../profiles/headless.nix ./ec2-data.nix ./amazon-grow-partition.nix ]; + imports = [ ../profiles/headless.nix ./ec2-data.nix ./amazon-grow-partition.nix ./amazon-init.nix ]; config = { diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix index 21cbbfda0b6..96cd57e6db5 100644 --- a/nixos/modules/virtualisation/amazon-init.nix +++ b/nixos/modules/virtualisation/amazon-init.nix @@ -44,7 +44,6 @@ let nixos-rebuild switch ''; in { - imports = [ "${modulesPath}/virtualisation/amazon-image.nix" ]; boot.postBootCommands = '' ${bootScript} & ''; diff --git a/nixos/release.nix b/nixos/release.nix index 2dc3f9efc71..d7c736d66a9 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -223,7 +223,7 @@ in rec { tests.dockerRegistry = hydraJob (import tests/docker-registry.nix { system = "x86_64-linux"; }); tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; }); tests.ec2-nixops = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-nixops; - #tests.ec2-config = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-config; + tests.ec2-config = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-config; tests.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; tests.fleet = hydraJob (import tests/fleet.nix { system = "x86_64-linux"; }); |