valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
81,145 Commits 24 Branches 182 Tags 341 MiB
bb4ec6c4db
Commit Graph

81145 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
ec1c9f6fda Merge pull request #40610 from cheald/develop 
Add `env` support for rvm.installed and rvm.do, `opts` support for .installed
 2017-04-10 16:24:00 -06:00
Mike Place
b6cf948afe Merge pull request #40615 from rallytime/fix-39863 
Call out to _pki_minions() once, rather than in a loop in _check_list_minions()
 2017-04-10 16:22:17 -06:00
rallytime
1a9f03ab92 Call out to _pki_minions() once, rather than in a loop in _check_list_minions() 
Fixes #39863
 2017-04-10 15:09:58 -06:00
Daniel Wallace
a86b101ae6 add retries on authentications of the salt minion reconnecting 2017-04-10 14:53:26 -06:00
wgoulet
bbac469cdb Updated documentation for Venafi module with better examples & clarifications 2017-04-10 15:41:24 -05:00
rallytime
67d08f60ff Fixup fileclient_test file to conform to new standards 2017-04-10 14:09:41 -06:00
rallytime
2cd0c5e4ec Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - doc/topics/cloud/azurearm.rst
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/aptpkg.py
  - salt/modules/dockermod.py
  - tests/unit/modules/dockerng_test.py
  - tests/unit/modules/test_pillar.py
 2017-04-10 14:09:25 -06:00
Chris Heald
5139275602 Add env support for rvm.installed and rvm.do, opts support for .installed 
Currently, the RVM state has no way to pass environment variables (ie, RUBY_CONFIGURE_OPTS)
or compilation flags (-C, --patch) to the Ruby installer. This patch enables this
functionality, permitting installation of customized Ruby installs. For example, the following
should now work:

   ruby-2.3.0:
     rvm.installed:
       - env:
           - RUBY_CONFIGURE_OPTS: --with-jemalloc
       - opts:
           - '--patch /path/to/my.patch'
           - '-C --enable-shared,--with-readline-dir=$HOME/.rvm/usr'
 2017-04-10 12:40:56 -07:00
Daniel Wallace
6e34c2b5e5 stat file when placing it on server instead of caching 
remove chmod of files in the fileserver
add stat_file to cp module
use cp.stat_file to get file mode in file module
add a note about keep not working with ssh
 2017-04-10 13:03:04 -06:00
Erik Johnson
5ea1f607b0 Fix mocking in unit tests 2017-04-10 13:57:39 -05:00
Erik Johnson
8dfa51f31f Moar fixes for source_hash_update 
This commit adds additional fixes make source_hash_update work as
expected.
 2017-04-10 13:54:55 -05:00
Nicole Thomas
93818257cb Merge pull request #40591 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-10 12:07:16 -06:00
rallytime
4957f7753e Fixup fileclient_test file to conform to new standards 2017-04-10 10:30:33 -06:00
Peter N
df9b061a33 Fix confusing typo in thorium start page 
The thorium auto deregistration example has a slightly confusing typo.  From my read of the docs it should `s/startreg/statreg` so I'm submitting this PR to make that effective.
 2017-04-10 10:54:26 -04:00
Artur Kaszuba
3a0d61f108 Use correct exec_driver in dockerng.sls module 
This change allow to execute dockerng.sls module with correct
docker exec_driver.
 2017-04-10 15:55:48 +02:00
Denys Havrysh
dae34b30f9 Add OpenRC init scripts for bootstrapping Alpine Linux from Git 2017-04-10 11:52:56 +03:00
Mathieu Le Marec - Pasquet
80d9482248 Fix #40602: onfail_stop: test loop order is broken 2017-04-10 10:22:03 +02:00
Super-User
1c0aafdbfa Always delete and re-add configuration to logadm 
There where weird issues with some flags going missing every now and
then. This is less ideal but so far no of the config has gone missing in
my tests.
 2017-04-09 16:29:06 +02:00
Super-User
511fed46e6 rename logadm.config_absent to logadm.remove, implement logadm.rotate 2017-04-09 16:14:17 +02:00
Super-User
3ec4d487b1 logadm's _parse_options should parse numbers as ints 2017-04-09 16:13:36 +02:00
Super-User
cf2898fbdb generate docs for salt.states.logadm 2017-04-09 15:44:18 +02:00
Super-User
431bf76a97 logadm.config_absent state 2017-04-09 10:47:24 +02:00
Super-User
f5cb6ab240 Fix a strange issue of logs not being added 
Added an except from the logadm manpage because it took me a good chunk
of the day to figure this one out!
 2017-04-09 10:43:52 +02:00
Christian McHugh
fc6cf53545 Ensure batch uses passed eauth token or credentials 2017-04-09 09:23:06 +01:00
Super-User
3299948de3 logadm's _parse_options should be better at figuring out the log_file 2017-04-09 10:05:28 +02:00
Tom Williams
0d61f25cc4 INFRA-4376 - fix one last pylint kvetch, and add a bit more exception catching 2017-04-07 22:20:47 -04:00
Tom Williams
5c4e704f97 INFRA-4376 - If pylint not happy, ain't NOBODY happy! 2017-04-07 18:26:08 -04:00
Tom Williams
805b3b4050 INFRA-4376 - Several boto_rds fixes and improvements 2017-04-07 18:26:08 -04:00
rallytime
8fb3810fa2 Resolve merge conflicts in salt.modules.dockermod.py 2017-04-07 15:14:04 -06:00
Mike Place
7dd4a52ca1 Merge pull request #40587 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-04-07 13:31:51 -06:00
Mike Place
4fa58be222 Merge pull request #40588 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-04-07 13:30:13 -06:00
Mike Place
72f83706bf Merge pull request #40569 from nevins-b/minor_pip_fix 
only look at stdout when doing pip --version
 2017-04-07 12:53:18 -06:00
Mike Place
109139efb2 Merge pull request #40579 from vquiering/zabbix_returner_do_not_split_minion_id 
in zabbix returner do not split the minion_id
 2017-04-07 12:52:47 -06:00
Mike Place
90c083d2b7 Merge pull request #40583 from whiteinge/keys-headers 
Add missing header docs to /keys URL
 2017-04-07 12:52:05 -06:00
rallytime
5a419b8aae Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/pillar.py
 2017-04-07 11:23:41 -06:00
rallytime
4a75675d07 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - doc/topics/cloud/azurearm.rst
  - salt/modules/aptpkg.py
  - salt/modules/dockermod.py
  - tests/unit/modules/dockerng_test.py
 2017-04-07 11:20:51 -06:00
rallytime
2670836bc0 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-07 10:57:57 -06:00
Seth House
2bc14958a8 Add missing header docs to /keys URL 2017-04-07 10:40:39 -06:00
Erik Johnson
7103707d49 Remove unnecessary versionadded lines 
There's already one at the top of the function's docstring.
 2017-04-07 10:42:39 -05:00
Nicole Thomas
3d07f637ca Merge pull request #40575 from rallytime/bp-40559 
Back-port #40559 to 2016.11
 2017-04-07 09:42:25 -06:00
Nicole Thomas
9041ca2ba5 Merge pull request #40576 from rallytime/bp-40573 
Back-port #40573 to 2016.11
 2017-04-07 09:20:10 -06:00
Pablo Suárez Hernández
cf874d80ef Adding missing kwargs parameters to pkg.install call 2017-04-07 16:10:19 +01:00
Pablo Suárez Hernández
f23f94d9ba Enables pkg.downloaded to verify packages after package manager call. 2017-04-07 16:10:18 +01:00
Pablo Suárez Hernández
9fd358ffd4 Pylint fixes 2017-04-07 16:10:17 +01:00
Pablo Suárez Hernández
6d178abfaa Fixes parse_targets when advisory id is passed as name 2017-04-07 16:09:55 +01:00
Pablo Suárez Hernández
2b5e6a0e95 Fixes _find_download_targets to call _preflight_check 2017-04-07 16:09:55 +01:00
Pablo Suárez Hernández
58b378acdd Moving advisory ids checks into pkg_resource.parse_targets 2017-04-07 16:09:55 +01:00
Pablo Suárez Hernández
5c520021e6 Improving function naming 2017-04-07 16:09:55 +01:00
Pablo Suárez Hernández
0dcd7a3ea5 Adds support for listing advisory patches with Yum 2017-04-07 16:09:53 +01:00
Pablo Suárez Hernández
40214081e2 Adds support for listing advisory patches with Zypper 2017-04-07 16:09:23 +01:00