saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #40120 from sergeizv/gce-expand-node-fix

Browse source 
gce: Exclude GCENodeDriver objects from _expand_node result
This commit is contained in:
Mike Place 2017-03-20 15:44:41 -06:00 • committed by GitHub
commit 33ba7821f7
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/cloud/clouds/gce.py
View file

@ -199,6 +199,13 @@ def _expand_node(node):
zone = ret['extra']['zone']
ret['extra']['zone'] = {}
ret['extra']['zone'].update(zone.__dict__)
# Remove unserializable GCENodeDriver objects
if 'driver' in ret:
del ret['driver']
if 'driver' in ret['extra']['zone']:
del ret['extra']['zone']['driver']
return ret