Author: eelco
Date: Thu May 12 15:30:56 2011
New Revision: 27238
URL: https://svn.nixos.org/websvn/nix/?rev=27238&sc=1

Log:
* Add an option ‘deployment.ec2.keyPair’.

Modified:
   nixos/trunk/modules/misc/deployment.nix

Modified: nixos/trunk/modules/misc/deployment.nix
==============================================================================
--- nixos/trunk/modules/misc/deployment.nix     Thu May 12 15:30:01 2011        
(r27237)
+++ nixos/trunk/modules/misc/deployment.nix     Thu May 12 15:30:56 2011        
(r27238)
@@ -38,10 +38,11 @@
 
     # EC2/Nova/Eucalyptus-specific options.
         
-    deployment.ec2.url = mkOption {
-      example = "https://ec2.eu-west-1.amazonaws.com:443/";;
+    deployment.ec2.controller = mkOption {
+      example = https://ec2.eu-west-1.amazonaws.com:443/;
       description = ''
-        URL of an Amazon EC2-compatible web service, used to create virtual 
machines.
+        URI of an Amazon EC2-compatible cloud controller web service,
+        used to create and manage virtual machines.
       '';
     };
 
@@ -63,6 +64,15 @@
       '';
     };
 
+    deployment.ec2.keyPair = mkOption {
+      example = "my-keypair";
+      description = ''
+        Name of the SSH key pair to be used to communicate securely
+        with the instance.  Key pairs can be created using the
+        <command>ec2-add-keypair</command> command.
+      '';
+    };
+
     # Ad hoc cloud options.
 
     deployment.adhoc.controller = mkOption {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to