Merge pull request #45981 from gtmanfred/2017.7.3

use local config for vault when masterless

salt/config/__init__.py

@@ -256,6 +256,7 @@ VALID_OPTS = {
 
     # Location of the files a minion should look for. Set to 'local' to never ask the master.
     'file_client': str,
+    'local': bool,
 
     # When using a local file_client, this parameter is used to allow the client to connect to
     # a master for remote execution.
@@ -1149,6 +1150,7 @@ DEFAULT_MINION_OPTS = {
         'base': [salt.syspaths.BASE_THORIUM_ROOTS_DIR],
         },
     'file_client': 'remote',
+    'local': False,
     'use_master_when_local': False,
     'file_roots': {
         'base': [salt.syspaths.BASE_FILE_ROOTS_DIR,

salt/utils/vault.py

@@ -111,7 +111,7 @@ def _get_vault_connection():
 
     if 'vault' in __opts__ and __opts__.get('__role', 'minion') == 'master':
         return _use_local_config()
-    elif '_ssh_version' in __opts__:
+    elif any((__opts__['local'], __opts__['file_client'] == 'local', __opts__['master_type'] == 'disable')):
         return _use_local_config()
     else:
         log.debug('Contacting master for Vault connection details')