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

Lintfix E0602

Browse source
This commit is contained in:
Bo Maryniuk 2017-04-21 14:33:10 +02:00
parent ed84420df0
commit 61558f08e7
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/cloud/clouds/nova.py
View file

@ -722,7 +722,7 @@ def request_instance(vm_=None, call=None):
return data, vm_
def _query_node_data(vm_, data):
def _query_node_data(vm_, data, conn):
try:
node = show_instance(vm_['name'], 'action')
log.debug(
@ -948,7 +948,7 @@ def create(vm_):
try:
data = salt.utils.cloud.wait_for_ip(
_query_node_data,
update_args=(vm_, data),
update_args=(vm_, data, conn),
timeout=config.get_cloud_config_value(
'wait_for_ip_timeout', vm_, __opts__, default=10 * 60),
interval=config.get_cloud_config_value(

4
salt/cloud/clouds/openstack.py
View file

@ -585,7 +585,7 @@ def request_instance(vm_=None, call=None):
return data, vm_
def _query_node_data(vm_, data, floating):
def _query_node_data(vm_, data, floating, conn):
try:
node = show_instance(vm_['name'], 'action')
log.debug(
@ -775,7 +775,7 @@ def create(vm_):
try:
data = salt.utils.cloud.wait_for_ip(
_query_node_data,
update_args=(vm_, data, vm_['floating']),
update_args=(vm_, data, vm_['floating'], conn),
timeout=config.get_cloud_config_value(
'wait_for_ip_timeout', vm_, __opts__, default=10 * 60),
interval=config.get_cloud_config_value(