valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
74,698 Commits 24 Branches 182 Tags 341 MiB
f7d8bc7cc7
Commit Graph

74698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
f7d8bc7cc7 Fix up pylint errors for #36957 (#36989) 
Refs #36957
 2016-10-13 16:10:42 -06:00
Theodore Cowan
1ee1d0daab Add tISM SDB module (#36957) 
* added tism sdb module

* If sdb profile is not set in conf, try the pillar

* Carefully get sdb pillar in case this is the salt-master

* use current method of getting sdb profile name

* complete sdb tism TODO items

* Cleanup of sdb tism module

* cleanup for linter
 2016-10-13 16:04:48 -06:00
Amir Pakdel
d7cfcf4135 Whitespace bugfix in linux acl.getfacl (#36827) 
* Whitespace bugfix in linux acl.getfacl

It is a trivial fix

* Whitespace bugfix in linux acl.setfacl

Also updated tests

* Linting
 2016-10-13 15:14:09 -06:00
Nicole Thomas
7cbe2ced02 Merge pull request #36974 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-10-13 12:58:30 -06:00
Nicole Thomas
5a1bda6eb2 Versionadded tag for policy_document_from_pillars in boto_iam_role state (#36979) 
Refs #36919
 2016-10-13 11:51:42 -06:00
Vivian
e1618710ef Enable policy_document from pillars (#36919) 
* Merged lyft changes to boto_iam exec and salt modules

* default to None

* made utils backwards compatible
 2016-10-13 11:48:19 -06:00
rallytime
c4dc0dd2ef Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-13 11:14:36 -06:00
Thomas S Hatch
62ed5dd00d Merge pull request #36891 from skizunov/develop2 
Add 'resolve_dns_fallback' option to config
 2016-10-13 11:11:29 -06:00
Jorge Schrauwen
374d4038d3 [develop] grains should have some information about zpools if available (#36839) 
* grains should have some information about zpools if available

* Add __opts__ as a global variable so test do not fail.

* fix lint error
 2016-10-13 11:04:38 -06:00
Thomas S Hatch
d624dc444c Merge pull request #36817 from ze42/fix_state_high 
state.high: fix test=True usage
 2016-10-13 10:57:40 -06:00
Nicole Thomas
a8eee6e90b Update the ip to test against in unit.utils.network_test.NetworkTestCase.test_host_to_ip (#36975) 2016-10-13 10:25:58 -06:00
rallytime
0a5b1f5466 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-13 09:58:18 -06:00
C. R. Oldham
41a96aefae Move authentication from esxi.cmd to proxy.ch_config, try to authenticate less often (#36954) 2016-10-13 09:51:34 -06:00
Nicole Thomas
5d12c80eda Merge pull request #36956 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-13 09:36:03 -06:00
Nicole Thomas
a2206e805f Merge pull request #36938 from wanparo/develop 
acl.delfacl: fix position of -X option to setfacl
 2016-10-13 08:53:34 -06:00
Tyler Hunt
39cd3ca552 add option to force a reauth for a docker registry (#36893) 
* add option to force a reauth for a docker registry

Fixes #32829. Adds ability to specify reauth in the docker-registry pillar data structure to specify the reauth kwarg to docker-py login call. If not specified it defaults to old behaviour of False

* added documentation for the new reuth option in docker registry configuration

also fixed a typo in the new code where I used cred instead of creds
 2016-10-13 08:52:32 -06:00
Joerg Reuter
bed3498121 Merge pull request #1 from rallytime/pr-36938 
Adjust linux_acl unit test argument ordering
 2016-10-13 10:52:39 +02:00
rallytime
1d3aaf8097 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-10-12 15:26:27 -06:00
Nicole Thomas
6714da714e Merge pull request #36952 from rallytime/bp-36875 
Back-port #36875 to carbon
 2016-10-12 15:03:42 -06:00
Nicole Thomas
c1f84388d6 Merge pull request #36950 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-12 14:57:41 -06:00
rallytime
1d3ce45ac0 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-12 13:30:09 -06:00
Andrew Pashkin
337119c113 Fix integration tests launching - remove redundant "config_dir" argument in call to ShellTestCase.run_run from SaltDaemonScriptBase._wait_until_running 2016-10-12 13:21:40 -06:00
Andrew Pashkin
27bc7aad91 Add Visual Studio Code related directory .vscode/ to .gitignore 2016-10-12 13:21:40 -06:00
Andrew Pashkin
304516420c Fix integration tests launching - remove redundant "config_dir" argument in call to ShellTestCase.run_run from SaltDaemonScriptBase._wait_until_running (#36875) 
* Add Visual Studio Code related directory .vscode/ to .gitignore

* Fix integration tests launching - remove redundant "config_dir" argument in call to ShellTestCase.run_run from SaltDaemonScriptBase._wait_until_running
 2016-10-12 13:20:30 -06:00
C. R. Oldham
2ccc44f314 Merge pull request #36914 from rallytime/suse_show_link 
Allow alternatives.show_link function to work on Suse distros
 2016-10-12 13:09:33 -06:00
rallytime
5362e5183e Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/cli/index.rst
 2016-10-12 12:36:00 -06:00
Nicole Thomas
7e2128c05d Merge pull request #36948 from rallytime/bp-36943 
Back-port #36943 to 2016.3
 2016-10-12 12:33:02 -06:00
Nicole Thomas
ab1ded3da4 Merge pull request #36947 from rallytime/bp-36901 
Back-port #36901 to carbon
 2016-10-12 12:32:50 -06:00
Nicole Thomas
f43a10252d Merge pull request #36946 from rallytime/bp-36892 
Back-port #36892 to 2016.3
 2016-10-12 12:32:35 -06:00
Nicole Thomas
5c70669ac0 Merge pull request #36945 from rallytime/bp-35199 
Back-port #35199 to 2016.3
 2016-10-12 12:31:15 -06:00
Denys Havrysh
fe2f094838 salt.modules.gpg: initialize GnuPG home dir with correct ownership (#36824) 
* salt.modules.gpg: fix files ownership when writing to GnuPG home dir

* salt.modules.gpg: fix docstrings when using decorator
 2016-10-12 11:13:27 -06:00
Erik Johnson
7565ed662a Fix versionadded (#36949) 
Since this was merged a couple weeks ago and we have yet to cut
v2016.3.4, this code will be in 2016.3.4, not 2016.3.5.
 2016-10-12 11:05:07 -06:00
rallytime
29d299d23b Adjust linux_acl unit test argument ordering 2016-10-12 10:57:42 -06:00
Mate Ory
d2f8f18430 doc: document what the argument of salt --subset means 2016-10-12 10:42:31 -06:00
Theodore Cowan
046aa22409 Try to get SDB profile from pillar (#36934) 
* If sdb profile is not set in conf, try the pillar

* Carefully get sdb pillar in case this is the salt-master

* use current method of getting sdb profile name
 2016-10-12 10:40:19 -06:00
Vitaliy Fuks
e7da7b8442 Typos are not fun! 2016-10-12 10:38:07 -06:00
Michał Sochoń
94c97ee726 Update tutorial.rst 
Fix error in the list.
 2016-10-12 10:34:28 -06:00
Justin Zandbergen
390b906c2f adhere pep8 e713 2016-10-12 10:33:16 -06:00
Justin Zandbergen
79c9905fc5 Re-added accidentally removed line 85 2016-10-12 10:33:16 -06:00
Justin Zandbergen
8bba13896a Fixed issue #35198 now without deprecated code. 2016-10-12 10:33:16 -06:00
Justin Zandbergen
1241d87f1d fix for issue #35198 2016-10-12 10:33:16 -06:00
Justin Findlay
4d8fb03b79 return opennebula errors to user (#36930) 
* cloud.clouds.opennebula: return errors to user

* cloud.clouds.opennebula._get_xml: add unit test
 2016-10-12 10:19:11 -06:00
Erik Johnson
4b21cca909 Fix race condition in which files were removed during a file.directory (#36928) 
This resolves a case in which a directory being managed by a
file.directory state was running a sphinx build, and temporary
files/dirs created by the build were present when the initial walk was
performed but were cleaned up by the time the state got around to
enforcing permissions.
 2016-10-12 09:56:53 -06:00
Őry, Máté
7d9fdfd0fe doc: document what the argument of salt --subset means (#36943) 2016-10-12 09:46:31 -06:00
Jacob Hammons
dd21da4992 Add autodoc topics for new modules added in Carbon (#36933) 
Module formatting issues
Add list of new Carbon modules to release notes
 2016-10-12 09:31:07 -06:00
Nicole Thomas
90bbf8dc4f Merge pull request #36931 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-10-12 09:26:17 -06:00
Joerg Reuter
8d64f197bc - acl.delfacl: fix position of -X option to setfacl 2016-10-12 13:02:38 +02:00
rallytime
55fe0aa2e4 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-11 17:22:12 -06:00
C. R. Oldham
6ea1f59058 Merge pull request #36929 from rallytime/fix-pending-upgrade-test 
[yumpkg] Skip test_pkg_upgrade_has_pending_upgrades if there are no upgrades
 2016-10-11 16:55:49 -06:00
rallytime
32829b9474 [yumpkg] Skip test_pkg_upgrade_has_pending_upgrades if there are no upgrades 
yumpkg.list_upgrades returns an empty dictionary when no upgrades are available.
We need to check for this situation and skip the test if no upgrades are present.

Fixes the test failure on Fedora 24 on Jenkins currently, but also protects against
any potential failures for other RHEL-based distros that aren't currently failing
because "ret" is populated with a dictionary of upgrades.
 2016-10-11 16:50:50 -06:00