[ARVADOS] updated: f0a929421c31d50d44fd30ac3a01b1cccc05e2d2

[git at public.curoverse.com]

Summary of changes:
 services/nodemanager/doc/ec2.example.cfg | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

       via  f0a929421c31d50d44fd30ac3a01b1cccc05e2d2 (commit)
      from  5668676421c245b9748910a2fda2fa2c6e91b923 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit f0a929421c31d50d44fd30ac3a01b1cccc05e2d2
Author: Brett Smith <brett at curoverse.com>
Date:   Fri Oct 3 18:04:56 2014 -0400

    Fixup: Modernize ec2 example configuration.

diff --git a/services/nodemanager/doc/ec2.example.cfg b/services/nodemanager/doc/ec2.example.cfg
index 001840d..f1bebdf 100644
--- a/services/nodemanager/doc/ec2.example.cfg
+++ b/services/nodemanager/doc/ec2.example.cfg
@@ -90,22 +90,24 @@ tag_arvados-class = dynamic-compute
 tag_cluster = zyxwv
 
 [Cloud Create]
-ex_keyname = string
-
 # New compute nodes will send pings to Arvados at this host.
 # You may specify a port, and use brackets to disambiguate IPv6 addresses.
 ping_host = hostname:port
 
-# File path for an SSH key that can log in to the compute node.
-ssh_key = filename
+# Give the name of an SSH key on AWS...
+ex_keyname = string
+
+# ... or a file path for an SSH key that can log in to the compute node.
+# (One or the other, not both.)
+# ssh_key = path
 
 # The EC2 IDs of the image and subnet compute nodes should use.
-image_id = string
-subnet_id = string
+image_id = idstring
+subnet_id = idstring
 
 # Comma-separated EC2 IDs for the security group(s) assigned to each
 # compute node.
-security_groups = sg1, sg2
+security_groups = idstring1, idstring2
 
 [Size t2.medium]
 # You can define any number of Size sections to list EC2 sizes you're

-----------------------------------------------------------------------


hooks/post-receive
--