valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

get cachedir_index add and del moved to __utils__

Browse Source
This commit is contained in:
Daniel Wallace 2016-11-02 16:13:36 -05:00
parent 881c4b7120
commit 8df7f37d3b
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/cloud/clouds/nova.py
View File

@ -537,7 +537,7 @@ def destroy(name, conn=None, call=None):
salt.utils.cloud.remove_sshkey(getattr(node, __opts__.get('ssh_interface', 'public_ips'))[0]) salt.utils.cloud.remove_sshkey(getattr(node, __opts__.get('ssh_interface', 'public_ips'))[0])
if __opts__.get('update_cachedir', False) is True: if __opts__.get('update_cachedir', False) is True:
__utils__['cloud.delete_minion_cachedir'](name, __active_provider_name__.split(':')[0], __opts__) __utils__['cloud.delete_minion_cachedir'](name, __active_provider_name__.split(':')[0], __opts__)
salt.utils.cloud.cachedir_index_del(name) __utils__['cloud.cachedir_index_del'](name)
return True return True
log.error('Failed to Destroy VM: {0}'.format(name)) log.error('Failed to Destroy VM: {0}'.format(name))
@ -1001,9 +1001,7 @@ def create(vm_):
sock_dir=__opts__['sock_dir'], sock_dir=__opts__['sock_dir'],
transport=__opts__['transport'] transport=__opts__['transport']
) )
salt.utils.cloud.cachedir_index_add( __utils__['cloud.cachedir_index_add'](vm_['name'], vm_['profile'], 'nova', vm_['driver'])
vm_['name'], vm_['profile'], 'nova', vm_['driver']
)
return ret return ret