You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whirr.apache.org by to...@apache.org on 2010/12/21 00:29:45 UTC

svn commit: r1051317 - in /incubator/whirr/trunk: CHANGES.txt src/site/confluence/configuration-guide.confluence src/site/confluence/quick-start-guide.confluence

Author: tomwhite
Date: Mon Dec 20 23:29:45 2010
New Revision: 1051317

URL: http://svn.apache.org/viewvc?rev=1051317&view=rev
Log:
WHIRR-166. Improve docs regarding private keys. Contributed by Stu Hood.

Modified:
    incubator/whirr/trunk/CHANGES.txt
    incubator/whirr/trunk/src/site/confluence/configuration-guide.confluence
    incubator/whirr/trunk/src/site/confluence/quick-start-guide.confluence

Modified: incubator/whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/CHANGES.txt?rev=1051317&r1=1051316&r2=1051317&view=diff
==============================================================================
--- incubator/whirr/trunk/CHANGES.txt (original)
+++ incubator/whirr/trunk/CHANGES.txt Mon Dec 20 23:29:45 2010
@@ -26,6 +26,10 @@ Trunk (unreleased changes)
     WHIRR-163. Support environment variable interpolation in configuration
     properties. (tomwhite)
 
+    WHIRR-157. Remove service name property. (tomwhite)
+
+    WHIRR-166. Improve docs regarding private keys. (Stu Hood via tomwhite)
+
   BUG FIXES
 
     WHIRR-128. Fix DNS resolution for clients running within EC2.
@@ -49,8 +53,6 @@ Trunk (unreleased changes)
     WHIRR-156. Cli script doesn't launch post-modularization. (Andrei Savu and
     tomwhite via tomwhite)
 
-    WHIRR-157. Remove service name property. (tomwhite)
-
 Release 0.2.0 - 2010-11-04
 
   NEW FEATURES

Modified: incubator/whirr/trunk/src/site/confluence/configuration-guide.confluence
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/src/site/confluence/configuration-guide.confluence?rev=1051317&r1=1051316&r2=1051317&view=diff
==============================================================================
--- incubator/whirr/trunk/src/site/confluence/configuration-guide.confluence (original)
+++ incubator/whirr/trunk/src/site/confluence/configuration-guide.confluence Mon Dec 20 23:29:45 2010
@@ -10,8 +10,8 @@ Whirr is configured using a properties f
 | {{whirr.provider}} | {{\--provider}} | {{ec2}} | The name of the cloud provider. See the [table below|#cloud-provider-config] for possible provider names.|
 | {{whirr.identity}} | {{\--identity}} | none | The cloud identity. See the [table below|#cloud-provider-config] for how this maps to the credentials for your provider. |
 | {{whirr.credential}} | {{\--credential}} | none | The cloud credential. See the [table below|#cloud-provider-config] for how this maps to the credentials for your provider. |
-| {{whirr.private-key-file}} | {{\--private-key-file}} | _\~/.ssh/id\_rsa_ | The filename of the private key used to connect to instances. |
-| {{whirr.public-key-file}} | {{\--public-key-file}} | _\~/.ssh/id\_rsa_.pub | The filename of the public key used to connect to instances. |
+| {{whirr.private-key-file}} | {{\--private-key-file}} | _\~/.ssh/id\_rsa_ | The filename of the private key used to connect to instances. Note: the public/private key must be set together, and must be passwordless. |
+| {{whirr.public-key-file}} | {{\--public-key-file}} | _\~/.ssh/id\_rsa_.pub | The filename of the public key used to connect to instances. Note: the public/private key must be set together, and must be passwordless.|
 | {{whirr.image-id}} | {{\--image-id}} | none | The ID of the image to use for instances. If not specified then a vanilla Linux image is chosen. |
 | {{whirr.hardware-id}} | {{\--hardware-id}} | none | The type of hardware to use for the instance. This must be compatible with the image ID. |
 | {{whirr.location-id}} | {{\--location-id}} | none | The location to launch instances in. If not specified then an arbitrary location will be chosen. |

Modified: incubator/whirr/trunk/src/site/confluence/quick-start-guide.confluence
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/src/site/confluence/quick-start-guide.confluence?rev=1051317&r1=1051316&r2=1051317&view=diff
==============================================================================
--- incubator/whirr/trunk/src/site/confluence/quick-start-guide.confluence (original)
+++ incubator/whirr/trunk/src/site/confluence/quick-start-guide.confluence Mon Dec 20 23:29:45 2010
@@ -40,6 +40,7 @@ whirr.provider=ec2
 whirr.identity=<cloud-provider-identity>
 whirr.credential=<cloud-provider-credential>
 whirr.private-key-file=${sys:user.home}/.ssh/id_rsa
+whirr.public-key-file=${sys:user.home}/.ssh/id_rsa.pub
 {code}
 
 Note that you do not need to choose a particular cloud image, since the default