cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Do not try to encode metadata if it is None (#46739)

Browse source 
* Do not try to encode metadata if it is None

* Add changelog fragment

* Fix fragment missing EOF line
This commit is contained in:
Thomas Picariello 2018-10-10 12:14:47 +02:00 committed by Martin Krizek
parent fcef4fdb26
commit 62d131716b
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/46739-gcp-compute-instance-metadata.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- "gcp_compute_instance - fix crash when the instance metadata is not set"

2
lib/ansible/modules/cloud/google/gcp_compute_instance.py
View file

@ -1106,7 +1106,7 @@ def raise_if_errors(response, err_path, module):
def encode_request(request, module): def encode_request(request, module):
if 'metadata' in request: if 'metadata' in request and request['metadata'] is not None:
request['metadata'] = metadata_encoder(request['metadata']) request['metadata'] = metadata_encoder(request['metadata'])
return request return request