Branch: refs/heads/master
Home: https://github.com/NixOS/charon
Commit: 517027202ef64cd77ac09233955f9cf9fded2530
https://github.com/NixOS/charon/commit/517027202ef64cd77ac09233955f9cf9fded2530
Author: Rob Vermaas <[email protected]>
Date: 2012-04-17 (Tue, 17 Apr 2012)
Changed paths:
M nix/options.nix
Log Message:
-----------
First step in supporting cluster instances, only in us-east-1 for now
diff --git a/nix/options.nix b/nix/options.nix
index f9f2cdb..c707eab 100644
--- a/nix/options.nix
+++ b/nix/options.nix
@@ -40,6 +40,7 @@ let
};
+ isEc2Hvm = (cfg.ec2.instanceType == "cc1.4xlarge" || cfg.ec2.instanceType ==
"cc2.8xlarge");
in
{
@@ -293,6 +294,8 @@ in
config = {
+ boot.loader.grub.extraPerEntryConfig = mkIf isEc2Hvm "root (hd0)";
+
deployment.ec2 = mkIf (cfg.ec2.region != "") {
controller = mkDefault "https://ec2.${cfg.ec2.region}.amazonaws.com/";;
@@ -300,6 +303,7 @@ in
# The list below is generated by running the "create-amis.sh" script,
then doing:
# $ while read system region ami; do echo " if cfg.ec2.region ==
\"$region\" && config.nixpkgs.system == \"$system\" then \"$ami\" else"; done <
amis
ami = mkDefault (
+ if cfg.ec2.region == "us-east-1" && config.nixpkgs.system ==
"x86_64-linux" && isEc2Hvm then "ami-6a9e4503" else
if cfg.ec2.region == "eu-west-1" && config.nixpkgs.system ==
"x86_64-linux" && !cfg.ec2.ebsBoot then "ami-732c1407" else
if cfg.ec2.region == "eu-west-1" && config.nixpkgs.system ==
"x86_64-linux" && cfg.ec2.ebsBoot then "ami-2b665d5f" else
if cfg.ec2.region == "eu-west-1" && config.nixpkgs.system ==
"i686-linux" && !cfg.ec2.ebsBoot then "ami-dd90a9a9" else
================================================================
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
