Merge pull request #209 from squee1945/support-gce-networks

Support GCE networks
elasticluster · Dec 7, 2015 · 89479dc · 89479dc
2 parents 791ea5c + 1865dd3
commit 89479dc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/docs/config.template b/docs/config.template
@@ -104,6 +104,8 @@
 #
 # zone:              The GCE zone to be used. Default is `us-central1-a`.
 #
+# network:           The GCE network to be used. Default is `default`.
+#
 #
 # Valid configuration keys for *openstack*
 # ----------------------------------------

diff --git a/docs/configure.rst b/docs/configure.rst
@@ -181,6 +181,11 @@ Valid configuration keys for `google`
 
     The GCE zone to be used. Default is `us-central1-a`.
 
+``network``
+
+    The GCE network to be used. Default is `default`.
+
+
 Valid configuration keys for *openstack*
 ----------------------------------------
 

diff --git a/elasticluster/conf.py b/elasticluster/conf.py
@@ -430,6 +430,7 @@ def nova_api_version(version):
                             "gce_project_id": All(str, Length(min=1)),
                             Optional("noauth_local_webserver"): Boolean(str),
                             Optional("zone"): All(str, Length(min=1)),
+                            Optional("network"): All(str, Length(min=1)),
         }
 
         cloud_schema_openstack = {"provider": 'openstack',