diff options
| author | David Shrewsbury <Shrews@users.noreply.github.com> | 2016-09-27 15:03:21 -0400 |
|---|---|---|
| committer | David Shrewsbury <shrewsbury.dave@gmail.com> | 2016-09-27 15:10:15 -0400 |
| commit | bebf8054b50d14331ddc24071a4944ee0a5fd8c5 (patch) | |
| tree | e7077bd06062efd1829ef91b4883865d84860e1b | |
| parent | 25695f81a229f0f487a7418e50c581a56a146ed0 (diff) | |
| download | ansible-modules-core-bebf8054b50d14331ddc24071a4944ee0a5fd8c5.tar.gz | |
Fix os_network's create_network() call for older shade versions (#5058)
A value for the project_id parameter to shade's create_network()
call was always being sent, even if no value for 'project' was
supplied. This was breaking folks with older versions of shade
(< 1.6).
Fixes PR https://github.com/ansible/ansible-modules-core/issues/3567
(cherry picked from commit 7994115bbc0272940e294cf7f9eddb667b04b69a)
| -rw-r--r-- | cloud/openstack/os_network.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cloud/openstack/os_network.py b/cloud/openstack/os_network.py index 9a0c2516..d80267e8 100644 --- a/cloud/openstack/os_network.py +++ b/cloud/openstack/os_network.py @@ -222,8 +222,12 @@ def main(): if provider and StrictVersion(shade.__version__) < StrictVersion('1.5.0'): module.fail_json(msg="Shade >= 1.5.0 required to use provider options") - net = cloud.create_network(name, shared, admin_state_up, - external, provider, project_id) + if project_id is not None: + net = cloud.create_network(name, shared, admin_state_up, + external, provider, project_id) + else: + net = cloud.create_network(name, shared, admin_state_up, + external, provider) changed = True else: changed = False |