From 95dc49a89d89de3ba1bc68520f32e02123cb05cd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 12 May 2011 15:30:56 +0000
Subject: [PATCH] =?UTF-8?q?*=20Add=20an=20option=20=E2=80=98deployment.ec2?=
 =?UTF-8?q?.keyPair=E2=80=99.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=27238
---
 modules/misc/deployment.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index b45948efdd1..d8d3f28e42e 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -38,10 +38,11 @@ with pkgs.lib;
 
     # 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 @@ with pkgs.lib;
       '';
     };
 
+    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 {