Merge pull request #46017 from rallytime/merge-2017.7

[2017.7] Merge forward from 2017.7.3 to 2017.7

doc/topics/releases/2017.7.4.rst

@@ -3,3 +3,78 @@ Salt 2017.7.4 Release Notes
 ===========================
 
 Version 2017.7.4 is a bugfix release for :ref:`2017.7.0 <release-2017-7-0>`.
+
+Changes for v2017.7.3..v2017.7.4
+---------------------------------------------------------------
+
+Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs):
+
+*Generated at: 2018-02-13T16:29:07Z*
+
+Statistics:
+
+- Total Merges: **4**
+- Total Issue references: **3**
+- Total PR references: **7**
+
+Changes:
+
+
+- **PR** `#45981`_: (*gtmanfred*) use local config for vault when masterless
+  @ *2018-02-13T15:22:01Z*
+
+  - **ISSUE** `#45976`_: (*grobinson-blockchain*) 6a5e0f9 introduces regression that breaks Vault module for salt masterless
+    | refs: `#45981`_
+  * ca76a0b328 Merge pull request `#45981`_ from gtmanfred/2017.7.3
+  * 0d448457dc apparently local is not set by default
+
+  * 2a92f4bc16 use local config for vault when masterless
+
+- **PR** `#45953`_: (*rallytime*) Back-port `#45928`_ to 2017.7.3
+  @ *2018-02-09T22:29:10Z*
+
+  - **ISSUE** `#45915`_: (*MatthiasKuehneEllerhold*) 2017.7.3: Salt-SSH & Vault Pillar: Permission denied "minion.pem"
+    | refs: `#45928`_
+  - **PR** `#45928`_: (*garethgreenaway*) [2017.7] Fixing vault when used with pillar over salt-ssh
+    | refs: `#45953`_
+  * 6530649dbc Merge pull request `#45953`_ from rallytime/`bp-45928`_-2017.7.3
+  * 85363189d1 Fixing vault when used with pillar over salt-ssh
+
+- **PR** `#45934`_: (*rallytime*) Back-port `#45902`_ to 2017.7.3
+  @ *2018-02-09T16:31:08Z*
+
+  - **ISSUE** `#45893`_: (*CrackerJackMack*) archive.extracted ValueError "No path specified" in 2017.7.3
+    | refs: `#45902`_
+  - **PR** `#45902`_: (*terminalmage*) Check the effective saltenv for cached archive
+    | refs: `#45934`_
+  * fb378cebb0 Merge pull request `#45934`_ from rallytime/`bp-45902`_
+  * bb83e8b345 Add regression test for issue 45893
+
+  * cdda66d759 Remove duplicated section in docstring and fix example
+
+  * 4b6351cda6 Check the effective saltenv for cached archive
+
+- **PR** `#45935`_: (*rallytime*) Back-port `#45742`_ to 2017.7.3
+  @ *2018-02-09T14:02:26Z*
+
+  - **PR** `#45742`_: (*marccardinal*) list.copy() is not compatible with python 2.7
+    | refs: `#45935`_
+  * 0d74151c71 Merge pull request `#45935`_ from rallytime/`bp-45742`_
+  * 6a0b5f7af3 Removed the chained copy
+
+  * ad1150fad4 list.copy() is not compatible with python 2.7
+
+
+.. _`#45742`: https://github.com/saltstack/salt/pull/45742
+.. _`#45893`: https://github.com/saltstack/salt/issues/45893
+.. _`#45902`: https://github.com/saltstack/salt/pull/45902
+.. _`#45915`: https://github.com/saltstack/salt/issues/45915
+.. _`#45928`: https://github.com/saltstack/salt/pull/45928
+.. _`#45934`: https://github.com/saltstack/salt/pull/45934
+.. _`#45935`: https://github.com/saltstack/salt/pull/45935
+.. _`#45953`: https://github.com/saltstack/salt/pull/45953
+.. _`#45976`: https://github.com/saltstack/salt/issues/45976
+.. _`#45981`: https://github.com/saltstack/salt/pull/45981
+.. _`bp-45742`: https://github.com/saltstack/salt/pull/45742
+.. _`bp-45902`: https://github.com/saltstack/salt/pull/45902
+.. _`bp-45928`: https://github.com/saltstack/salt/pull/45928

salt/cloud/__init__.py

@@ -234,7 +234,7 @@ class CloudClient(object):
                          if a.get('provider', '')]
             if providers:
                 _providers = opts.get('providers', {})
-                for provider in list(_providers).copy():
+                for provider in _providers.copy():
                     if provider not in providers:
                         _providers.pop(provider)
         return opts

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')