[Swift-commit] r8074 - trunk/resources

[yadunandb at ci.uchicago.edu]

Author: yadunandb
Date: 2014-08-05 15:50:48 -0500 (Tue, 05 Aug 2014)
New Revision: 8074

Modified:
   trunk/resources/swift.conf.schema
Log:
Updating conf schema



Modified: trunk/resources/swift.conf.schema
===================================================================
--- trunk/resources/swift.conf.schema	2014-07-29 16:40:26 UTC (rev 8073)
+++ trunk/resources/swift.conf.schema	2014-08-05 20:50:48 UTC (rev 8074)
@@ -110,12 +110,26 @@
 				ppn: "?StrictlyPositiveInt"
 				pbs.properties: "?String"
 				condor: "?Object"
+
+                # Required ec2 configs :
                 ec2CredentialsFile: "?String"
+                ec2WorkerImage: "?String"
+                ec2WorkerType: "?String"
+                # Optional ec2 configs :
                 ec2SecurityGroup: "?String"
                 ec2KeypairName: "?String"
                 ec2KeypairFile: "?String"
-                ec2WorkerImage: "?String"
-                ec2WorkerType: "?String"
+
+                # Required gce configs
+                gceKeypairFile: "?String"
+                gceEmailAccount: "?String"
+                gceProjectId: "?String"
+                gceZone: "?String"
+                gceWorkerType: "?String"
+                gceWorkerImage: "?String"
+                # Optional gce configs
+                gceSecurityGroup: "?String"
+
 			}
 		}
 	}