Commit Graph

78204 Commits

Author SHA1 Message Date
Erik Johnson
bf45ae6e6a
Fix grains.has_value when value is False
This function returns a boolean based on the boolean result of the value
returned when looking up the key. However, this means that if a key
exists and has a value of 0, an empty string, or False/None,
grains.has_value will incorrectly return False. This fixes that by only
returning False when the key is not present.
2017-10-09 08:21:12 -05:00
C. R. Oldham
962a20cf4b
Require that bindpw be non-empty if auth.ldap.anonymous=False 2017-10-06 15:41:07 -06:00
C. R. Oldham
9df3d91d8f
Release notes blurb for change to bindpw requirements 2017-10-06 15:33:10 -06:00
Pablo Suárez Hernández
44bc91bb98
Enable '--with-salt-version' parameter for setup.py script 2017-10-06 17:12:15 +01:00
Nicole Thomas
9ac3f2ea7b Merge pull request #43888 from rallytime/bp-43841
Back-port #43841 to 2016.11
2017-10-05 16:09:57 -04:00
Nicole Thomas
f880ac4c08 Merge pull request #43916 from dereckson/fix-typo-cloud-scaleway
Fix typo in salt-cloud scaleway documentation
2017-10-05 14:57:59 -04:00
Sébastien Santoro
15b8b8a9f4
Fix typo in salt-cloud scaleway documentation
s/scalewa/scaleway
2017-10-04 23:23:00 +00:00
Nicole Thomas
2ab7549d48 Merge pull request #43884 from UtahDave/2016.11local
Update SaltConf banner per Rhett's request
2017-10-04 09:08:29 -04:00
garethgreenaway
e3b2857285 Merge branch '2016.11' into 2016.11local 2017-10-03 11:50:29 -07:00
Damon Atkins
a0d08598bf dco fix 2017-10-04 04:44:57 +11:00
Damon Atkins
9467899fc6 Merge remote branch 'upstream/2016.11' into 2016.11_43417_Backport_and_Fixes 2017-10-04 04:34:18 +11:00
Damon Atkins
6dc180fd0e doco fixes 2017-10-04 04:32:57 +11:00
apapp
87d676f08a
add -n with netstat so we don't resolve 2017-10-03 13:32:30 -04:00
Damon Atkins
2496a42ea4 lint fix 2017-10-04 03:25:56 +11:00
Nicole Thomas
4b882d4272 Merge pull request #43869 from terminalmage/issue43522
Only join cmd if it's not a string
2017-10-03 12:25:07 -04:00
David Boucha
8c671fd0c1
Update SaltConf banner per Rhett's request 2017-10-03 10:07:28 -06:00
Damon Atkins
2c937fbe19 Merge remote branch 'upstream/2016.11' into 2016.11_43417_Backport_and_Fixes 2017-10-03 19:52:03 +11:00
Damon Atkins
c9c8c48a4d all remove/install commands are passed to cmd.exe /s /c and commands are passed as strings to cmdmod 2017-10-03 17:32:16 +11:00
Erik Johnson
fe28b0d4fb
Only join cmd if it's not a string
See https://github.com/saltstack/salt/pull/43807#discussion_r142009644
2017-10-02 14:42:40 -05:00
nicholasmhughes
dbeeb0e917
fixes #38452 atomicfile only copies mode and not user/group perms 2017-10-02 12:33:27 -04:00
Nicole Thomas
a2161efda3 Merge pull request #43707 from terminalmage/issue43373
Add missing support for use/use_in requisites to state.sls_id
2017-10-01 10:07:52 -04:00
Andrei Belov
12845ae802
Several fixes for RDS DB parameter group management
In particular:

 - it is now possible to manage all the parameters in a group,
   without limiting to MaxRecords=100 (thanks to pagination);

 - update_parameter_group() now composes valid JSON payload,
   automatically substitutes boolean values to 'on' / 'off' strings;

 - parameter_present() now shows actual error message produced by
   ModifyDBParameterGroup API call.
2017-09-29 11:53:22 -04:00
garethgreenaway
85b3aa332a Merge pull request #43807 from terminalmage/issue43522
cmdmod: Don't list-ify string commands on Windows
2017-09-28 19:48:35 -07:00
Erik Johnson
d8708bf698
cmdmod: Don't list-ify string commands on Windows
See https://github.com/saltstack/salt/issues/43522.
2017-09-28 13:10:03 -05:00
Mike Place
ea8d273c2b Merge pull request #43768 from vutny/fix-pylint-deprecation-warnings
Fix Pylint deprecated option warnings
2017-09-28 14:27:35 +02:00
Ch3LL
5fb3f5f6b1
Add Security Notes to 2016.3.8 Release Notes 2017-09-27 14:52:29 -04:00
Ch3LL
f72bc00000
[2016.11] Bump latest and previous versions 2017-09-27 12:24:09 -04:00
garethgreenaway
f8b3fa9da1 Merge branch '2016.11' into fix-pylint-deprecation-warnings 2017-09-27 08:40:21 -07:00
garethgreenaway
1a8cc60bb4 Merge pull request #43772 from gtmanfred/2016.11
dont print Minion not responding with quiet
2017-09-27 08:39:17 -07:00
garethgreenaway
3ebde1895f Merge branch '2016.11' into issue43373 2017-09-27 08:27:00 -07:00
Daniel Wallace
0194c60960
dont print Minion not responding with quiet 2017-09-27 08:29:41 -06:00
Denys Havrysh
651ed16ad3 Fix Pylint deprecated option warnings 2017-09-27 10:38:47 +03:00
Erik Johnson
9dee896fb9 Merge pull request #43747 from rallytime/gpg-verification
Add GPG Verification section to Contributing Docs
2017-09-26 16:25:37 -05:00
Nicole Thomas
7a70de19f4 Merge branch '2016.11' into gpg-verification 2017-09-26 16:35:29 -04:00
Nicole Thomas
1cc3ad1c8d Merge pull request #43733 from terminalmage/issue43729
Allow docker_events engine to work with newer docker-py
2017-09-26 12:47:39 -04:00
Nicole Thomas
5d38be4ff7 Merge pull request #43458 from terminalmage/issue42082
Fix missing PER_REMOTE_ONLY in cache.clear_git_lock runner
2017-09-26 10:39:00 -04:00
rallytime
23bb4a5dde
Add GPG Verification section to Contributing Docs
When we enable GPG Verification for pull request reviews, we should
make sure there is information available in our Contributing docs
about how to sign commits.
2017-09-26 10:16:56 -04:00
Nicole Thomas
e580ed4caa Merge branch '2016.11' into issue43373 2017-09-26 10:10:32 -04:00
Erik Johnson
023a563657 Merge pull request #43727 from rallytime/fix-43650
Revise "Contributing" docs: merge-forwards/release branches explained!
2017-09-26 07:43:15 -05:00
Erik Johnson
6e5c99bda0
Allow docker_events engine to work with newer docker-py
The Client attribute was renamed to APIClient in docker-py 2.0
2017-09-26 07:18:33 -05:00
Erik Johnson
5b3be6e8af
Fix failing unit test 2017-09-25 16:06:33 -05:00
Erik Johnson
5f90812b12
Fix missing PER_REMOTE_ONLY in cache.clear_git_lock runner
This allows for the runner to clear the git lock if any of the
per-remote-only params was present in the configuration.

This also adds PER_REMOTE_ONLY attributes to the winrepo runner and
git_pillar external pillar, and fixes all refs to GitBase's init_remotes
function to include PER_REMOTE_ONLY arguments. This will insulate us
against future headaches if either git_pillar or winrepo gain extra
per-remote-only params, as we will only need to make the change to the
attribute in their respective modules.
2017-09-25 15:17:47 -05:00
rallytime
babad12d83
Revise "Contributing" docs: merge-forwards/release branches explained!
Fixes #43650

The merge-forward process needs a more prominent position and explanation
in the contributing documentation. This change attempts to explain this
process a little more fully and incorporates some changes to how we are
handling "main" release branches, "dot" release branches, and "develop"
in a more complete context with merge-forwards.
2017-09-25 15:23:01 -04:00
Damon Atkins
350244bd93 typo in comments and doc strings. 2017-09-24 03:03:44 +10:00
Damon Atkins
ec31f5a9bd 2017.11/develop version() was ignoring saltenv setting. 2017-09-23 18:43:52 +10:00
Damon Atkins
b314549a32 Backport of devlop to 2016.11 with additional bug fixes
Taken the develop version of win_pkg.py and
- import sys to get INT max size for compare_version()
- enhanced compare_version to support versions of 'Not Found' and 'latest'
  which can occur in windows.
- comment out import salt.utils.platform which is not in 2016.11
-- salt.utils.platform.is_windows() renamed back to salt.utils.is_windows()
- added back the warning about win_repo_source_dir removal as this is
  required for 2016.11 version.

Added on top of the backport is
- Additional comments into the code
-- Indicate pkg_list can return a 'version number' and also 'Not Found'
   version number
-- _get_latest_pkg_version() can return 'version number' or 'latest'
-- latest_version() can return blank if the latest version is installed or no
   version at all is installed

- upgrade_available did not require to version() and latest_version() as
  latest_version() does everything required.

- list_upgrades() added comments to explain code code, simply code
  to latest_version() rather than calling latest_version()
  and compare_versions()

- list_available() is not required to force a refresh by default

- version() added comments and questions as the return value
  is non standard

- genrepo() add questions around the open mode and
  get_repo_data open mode

- _repo_process_pkg_sls()
-- file param was renamed to filename as file variable name classes
   with file()
-- rename var version to version_str so as not to import
   version() function
-- remove a section of code which was never executed and never used

- install()
-- simplied an if statements
-- add more code comments
2017-09-23 16:07:25 +10:00
Erik Johnson
f73764481b Add missing support for use/use_in requisites to state.sls_id
Because requisite resolution doesn't happen until we run call_high, and
state.sls_id doesn't run call_high (but rather calls a single low chunk
from the compiled low chunks), the use/use_in requisites are ignored.
This fixes that oversight by resolving requisites in state.sls_id before
we compile the high data.
2017-09-22 17:03:53 -05:00
Mike Place
f46c858f25 Merge pull request #43648 from rallytime/handle-boto-vpc-errors
Handle VPC/Subnet ID not found errors in boto_vpc module
2017-09-22 11:40:42 -06:00
Mike Place
9dba34aa06 Merge pull request #43575 from akissa/fix-csr-not-recreated-if-key-changes
Fix CSR not recreated if key changes
2017-09-21 11:52:00 -06:00
Mike Place
1d4fa48209 Merge pull request #43672 from rallytime/bp-43415
Back-port #43415 to 2016.11
2017-09-21 10:38:55 -06:00