From 4b5a459fc11b8c48e4cb24b61a72d25e2f5ac7f3 Mon Sep 17 00:00:00 2001 From: John Baublitz Date: Tue, 24 May 2016 14:55:38 -0400 Subject: [PATCH] Changes to allow 'auto' mode which does not allow IP address specification --- cloud/google/gce_net.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/cloud/google/gce_net.py b/cloud/google/gce_net.py index 174ceba6716..ed2dec92e8c 100644 --- a/cloud/google/gce_net.py +++ b/cloud/google/gce_net.py @@ -240,12 +240,16 @@ def main(): # user wants to create a new network that doesn't yet exist if name and not network: - if not ipv4_range: - module.fail_json(msg="Network '" + name + "' is not found. To create network, 'ipv4_range' parameter is required", + if not ipv4_range and mode != 'auto': + module.fail_json(msg="Network '" + name + "' is not found. To create network in legacy mode, 'ipv4_range' parameter is required", changed=False) + if mode == 'legacy': + kwargs = {} + else: + kwargs = {'mode': mode} try: - network = gce.ex_create_network(name, ipv4_range, mode=mode) + network = gce.ex_create_network(name, ipv4_range, **kwargs) json_output['name'] = name json_output['ipv4_range'] = ipv4_range changed = True