Merge branch 'master' into 4138-node-manager-google-cloud

[arvados.git] / services / nodemanager / doc / gce.example.cfg

diff --git a/services/nodemanager/doc/gce.example.cfg b/services/nodemanager/doc/gce.example.cfg
index 4886cb23a4ec640b5a2dda9d64eb18ea8ab40df7..adc0300ec19a7a10af3dc36dfb75fd4f25351d9c 100644 (file)
--- a/services/nodemanager/doc/gce.example.cfg
+++ b/services/nodemanager/doc/gce.example.cfg
@@ -82,15 +82,15 @@ shutdown_windows = 54, 5, 1
 user_id = USERID
 key = SECRET_KEY
 project = project_name
-timeout = 60             # used by NodeManagerConfig
+timeout = 60
 
 # Optional settings. For full documentation see
 # http://libcloud.readthedocs.org/en/latest/compute/drivers/gce.html#libcloud.compute.drivers.gce.GCENodeDriver
 #
-# datacenter = 'us-central1-a'
-# auth_type = 'SA'               # SA, IA or GCE
+# datacenter = us-central1-a
+# auth_type = SA               # SA, IA or GCE
 # scopes = https://www.googleapis.com/auth/compute
-# credential_file = 
+# credential_file =
 
 [Cloud List]
 # Keywords here will be used to populate the metadata field for a GCE node.