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

[2016.3] Update salt.utils.cloud references to __utils__ for cache funcs

Browse source 
Follow up to #35483
This commit is contained in:
rallytime 2016-10-17 14:46:22 -06:00
parent 9378b22d80
commit d0dc7d4e55
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/cloud/clouds/dimensiondata.py
View file

@ -148,7 +148,7 @@ def create(vm_):
if 'provider' in vm_:
vm_['driver'] = vm_.pop('provider')
salt.utils.cloud.fire_event(
__utils__['cloud.fire_event'](
'event',
'starting create',
'salt/cloud/{0}/creating'.format(vm_['name']),
@ -309,7 +309,7 @@ def create(vm_):
)
)
salt.utils.cloud.fire_event(
__utils__['cloud.fire_event'](
'event',
'created instance',
'salt/cloud/{0}/created'.format(vm_['name']),
@ -391,7 +391,7 @@ def create_lb(kwargs=None, call=None):
log.debug('Network Domain: %s', network_domain.id)
lb_conn.ex_set_current_network_domain(network_domain.id)
salt.utils.cloud.fire_event(
__utils__['cloud.fire_event'](
'event',
'create load_balancer',
'salt/cloud/loadbalancer/creating',
@ -403,7 +403,7 @@ def create_lb(kwargs=None, call=None):
name, port, protocol, algorithm, members
)
salt.utils.cloud.fire_event(
__utils__['cloud.fire_event'](
'event',
'created load_balancer',
'salt/cloud/loadbalancer/created',

22
salt/cloud/clouds/profitbricks.py
View file

@ -401,7 +401,7 @@ def list_nodes_full(conn=None, call=None):
ret[node['name']] = node
salt.utils.cloud.cache_node_list(
__utils__['cloud.cache_node_list'](
ret,
__active_provider_name__.split(':')[0],
__opts__
@ -420,7 +420,11 @@ def show_instance(name, call=None):
)
nodes = list_nodes_full()
salt.utils.cloud.cache_node(nodes[name], __active_provider_name__, __opts__)
__utils__['cloud.cache_node'](
nodes[name],
__active_provider_name__,
__opts__
)
return nodes[name]
@ -434,7 +438,7 @@ def get_node(conn, name):
if item['properties']['name'] == name:
node = {'id': item['id']}
node.update(item['properties'])
salt.utils.cloud.cache_node(
__utils__['cloud.cache_node'](
salt.utils.cloud.simple_types_filter(node),
__active_provider_name__,
__opts__
@ -606,7 +610,7 @@ def create(vm_):
create_volumes=[volume]
)
salt.utils.cloud.fire_event(
__utils__['cloud.fire_event'](
'event',
'requesting instance',
'salt/cloud/{0}/requesting'.format(vm_['name']),
@ -697,7 +701,7 @@ def create(vm_):
)
)
salt.utils.cloud.fire_event(
__utils__['cloud.fire_event'](
'event',
'created instance',
'salt/cloud/{0}/created'.format(vm_['name']),
@ -711,7 +715,7 @@ def create(vm_):
if 'ssh_host' in vm_:
vm_['key_filename'] = get_key_filename(vm_)
ret = salt.utils.cloud.bootstrap(vm_, __opts__)
ret = __utils__['cloud.bootstrap'](vm_, __opts__)
ret.update(data)
return ret
else:
@ -740,7 +744,7 @@ def destroy(name, call=None):
'-a or --action.'
)
salt.utils.cloud.fire_event(
__utils__['cloud.fire_event'](
'event',
'destroying instance',
'salt/cloud/{0}/destroying'.format(name),
@ -754,7 +758,7 @@ def destroy(name, call=None):
conn.delete_server(datacenter_id=datacenter_id, server_id=node['id'])
salt.utils.cloud.fire_event(
__utils__['cloud.fire_event'](
'event',
'destroyed instance',
'salt/cloud/{0}/destroyed'.format(name),
@ -763,7 +767,7 @@ def destroy(name, call=None):
)
if __opts__.get('update_cachedir', False) is True:
salt.utils.cloud.delete_minion_cachedir(
__utils__['cloud.delete_minion_cachedir'](
name,
__active_provider_name__.split(':')[0],
__opts__