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 #45720 from dwoz/issue-44449-prod-fix

Browse source 
Salt cloud adds newly created insances to cache
This commit is contained in:
Nicole Thomas 2018-01-26 17:45:42 -05:00 • committed by GitHub
commit 91b848debb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/cloud/clouds/ec2.py
View file

@ -2802,6 +2802,7 @@ def create(vm_=None, call=None):
# Ensure that the latest node data is returned
node = _get_node(instance_id=vm_['instance_id'])
__utils__['cloud.cache_node'](node, __active_provider_name__, __opts__)
ret.update(node)
return ret

14
salt/utils/cloud.py
View file

@ -2656,7 +2656,8 @@ def request_minion_cachedir(
fname = '{0}.p'.format(minion_id)
path = os.path.join(base, 'requested', fname)
with salt.utils.fopen(path, 'w') as fh_:
mode = 'wb' if six.PY3 else 'w'
with salt.utils.fopen(path, mode) as fh_:
msgpack.dump(data, fh_)
@ -2766,8 +2767,9 @@ def list_cache_nodes_full(opts=None, provider=None, base=None):
# Finally, get a list of full minion data
fpath = os.path.join(min_dir, fname)
minion_id = fname[:-2] # strip '.p' from end of msgpack filename
with salt.utils.fopen(fpath, 'r') as fh_:
minions[driver][prov][minion_id] = msgpack.load(fh_)
mode = 'rb' if six.PY3 else 'r'
with salt.utils.fopen(fpath, mode) as fh_:
minions[driver][prov][minion_id] = msgpack.load(fh_, encoding='utf-8')
return minions
@ -2945,7 +2947,8 @@ def cache_node_list(nodes, provider, opts):
for node in nodes:
diff_node_cache(prov_dir, node, nodes[node], opts)
path = os.path.join(prov_dir, '{0}.p'.format(node))
with salt.utils.fopen(path, 'w') as fh_:
mode = 'wb' if six.PY3 else 'w'
with salt.utils.fopen(path, mode) as fh_:
msgpack.dump(nodes[node], fh_)
@ -2970,7 +2973,8 @@ def cache_node(node, provider, opts):
if not os.path.exists(prov_dir):
os.makedirs(prov_dir)
path = os.path.join(prov_dir, '{0}.p'.format(node['name']))
with salt.utils.fopen(path, 'w') as fh_:
mode = 'wb' if six.PY3 else 'w'
with salt.utils.fopen(path, mode) as fh_:
msgpack.dump(node, fh_)