Move new kwargs to the end of argument list

saltstack · Feb 16, 2017 · 2761a1b · 2761a1b
1 parent 0df6b92
commit 2761a1b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/salt/minion.py b/salt/minion.py
@@ -132,7 +132,7 @@
 # 6. Handle publications
 
 
-def resolve_dns(opts, connect=True, fallback=True):
+def resolve_dns(opts, fallback=True, connect=True):
     '''
     Resolves the master_ip and master_uri options
     '''
@@ -149,7 +149,7 @@ def resolve_dns(opts, connect=True, fallback=True):
             if opts['master'] == '':
                 raise SaltSystemExit
             ret['master_ip'] = \
-                    salt.utils.dns_check(opts['master'], opts['master_port'], connect, True, opts['ipv6'])
+                    salt.utils.dns_check(opts['master'], opts['master_port'], True, opts['ipv6'], connect)
         except SaltClientError:
             if opts['retry_dns']:
                 while True:
@@ -163,7 +163,7 @@ def resolve_dns(opts, connect=True, fallback=True):
                     time.sleep(opts['retry_dns'])
                     try:
                         ret['master_ip'] = salt.utils.dns_check(
-                            opts['master'], opts['master_port'], connect, True, opts['ipv6']
+                            opts['master'], opts['master_port'], True, opts['ipv6'], connect
                         )
                         break
                     except SaltClientError:

diff --git a/salt/utils/__init__.py b/salt/utils/__init__.py
@@ -716,7 +716,7 @@ def ip_bracket(addr):
     return addr
 
 
-def dns_check(addr, port, connect=True, safe=False, ipv6=None):
+def dns_check(addr, port, safe=False, ipv6=None, connect=True):
     '''
     Return the ip resolved by dns, but do not exit on failure, only raise an
     exception. Obeys system preference for IPv4/6 address resolution.