Commit Graph

88168 Commits

Author SHA1 Message Date
Nicole Thomas
714d057295
Merge branch 'develop' into move-44053 2017-12-04 12:53:59 -05:00
Nicole Thomas
aa00137b51
Merge pull request #44713 from SamYaple/keystone_shade
Add new keystone module and states based on shade
2017-12-04 11:53:24 -05:00
Nicole Thomas
f526a20ffb
Merge pull request #44800 from sjorge/sunos_swap_grain
Fix swap grains for Solaris-like operating systems
2017-12-04 10:19:44 -05:00
Nicole Thomas
8c765dcd75
Merge branch 'develop' into keystone_shade 2017-12-03 20:44:05 -05:00
Nicole Thomas
36743424fa
Merge pull request #44785 from eradman/salt_bootstrap_doc
Update salt_boostrap command line help summary
2017-12-03 20:34:49 -05:00
Erik Johnson
02c2be63ba
Merge pull request #44594 from PeterS242/develop
Fixup in _get_extra_options method
2017-12-03 17:34:13 -06:00
Erik Johnson
a32464be66
Merge pull request #44789 from twangboy/win_reset_perms
Add ability to reset file system object perms
2017-12-03 17:20:40 -06:00
Erik Johnson
562193f5c6
Merge pull request #44577 from gtmanfred/develop
check if the filesystem support lsattr
2017-12-03 17:17:51 -06:00
Erik Johnson
05da78edfe
Merge pull request #44798 from amendlik/sdb-doc
Correct CLI examples in SDB runner documentation
2017-12-03 17:13:59 -06:00
Erik Johnson
67d020c8b1
Merge pull request #44803 from samodid/fix_typo_in_docstrings
fix copy-paste errors in doc strings for saltutil module and runner
2017-12-03 17:13:08 -06:00
Volodymyr Samodid
b811cc7343
fix copy-paste errors in doc strings for saltutil module and runner 2017-12-03 22:38:26 +02:00
Jorge Schrauwen
1eb4fc884c Fix swap grains for Solaris-like operating systems
The output of ```swap -s``` is the same on atleast the following:
- Solaris 11.3
- Solaris 10
- OmniOS
- OpenIndiana
- SmartOS

```
total: 3251464k bytes allocated + 827664k reserved = 4079128k used,
181507256k available
```

The first value is the current allocate mount of swap without
reservations, the 2nd value is the reservation, the 3rd value is the
current used (allocate + reservation) the last value is the amount of
currently available swap.

We want available + used to get the total.
2017-12-03 10:33:43 +01:00
Adam Mendlik
281992195a
Correct CLI examples in SDB runner documentation 2017-12-02 17:30:41 -07:00
twangboy
371e210247
Add ability to reset file system object perms 2017-12-01 16:51:18 -07:00
Thomas S Hatch
887336c6de
Merge pull request #44691 from isbm/isbm-ansiblegate-issue44670
Bugfix: ansiblegate, issue 44670
2017-12-01 16:11:52 -07:00
Thomas S Hatch
6d815440f8
Merge pull request #44769 from thatch45/pause_states
Pause states
2017-12-01 15:56:56 -07:00
Thomas S Hatch
30bb80f75a
Merge pull request #44786 from thatch45/try_tb
try to ensure that the ret is never None
2017-12-01 15:55:01 -07:00
Thomas S Hatch
441a6d6204
Merge pull request #44753 from garethgreenaway/various_schedule_skip_bits
[develop] Various updates to the scheduler
2017-12-01 15:48:18 -07:00
Eric Radman
bf9dc026bb
Update salt_boostrap command line help summary
- Use exact indentation produced by the bootstrap-salt command
- normal package installs work fine on OpenBSD
2017-12-01 15:28:09 -05:00
Sam Yaple
8a567f3d0b
Add new keystone module and states based on shade
Test cases will be added in future patch
2017-12-01 15:17:48 -05:00
Thomas S Hatch
d2ccd6acd6 try to ensure that the ret is never None 2017-12-01 12:02:15 -07:00
Nicole Thomas
cd79d7cb75
Merge pull request #44740 from rallytime/develop-bump-oxygen-warnings
[develop] Bump deprecation notice in utils/args from Oxygen to Fluorine
2017-12-01 10:22:35 -05:00
Thomas S Hatch
4abc8235a2 Add extra check for non-jid runs, as these can't be paused 2017-12-01 08:18:28 -07:00
Nicole Thomas
5b3da7dbb3
Merge pull request #44762 from cloudflare/sync-thorium
Add saltutil.sync_thorium execution and runner functions
2017-12-01 09:21:19 -05:00
Bo Maryniuk
dc91506913 Remove logging from the trace level in __virtual__ 2017-12-01 11:21:27 +01:00
Bo Maryniuk
cfe67fdecd Move __virtual__ logging into trace level 2017-12-01 11:21:27 +01:00
Bo Maryniuk
150dcc8b90 Move logging about load failure to the debug level 2017-12-01 11:21:27 +01:00
Bo Maryniuk
e1eec2c69d Add unit test for __virtual__ in case Ansible is installed on the Minion 2017-12-01 11:21:27 +01:00
Bo Maryniuk
fa21af69dd Add unit test for __virtual__ in case Ansible is not installed on the Minion 2017-12-01 11:21:27 +01:00
Bo Maryniuk
6ea51d8bcd Fix broken Python indent. 2017-12-01 11:21:27 +01:00
Gareth J. Greenaway
ac8f28d921
fixing issue with jobs running twice. 2017-11-30 22:02:07 -08:00
Gareth J. Greenaway
dc2a0313e0
Adding requested changes for validation and documentation 2017-11-30 22:02:07 -08:00
Gareth J. Greenaway
b681c229a0
Adding a simple job to skip jobs at specified times. Adding versionadded tags to new functions. Updating parameters for postpone function to ensure it's more clear. Adding documentation for which was implemented awhile ago but never documented. 2017-11-30 22:02:07 -08:00
Gareth J. Greenaway
a28e39ef31
Merging changes from #44630 for updates to scheduler to deal with loop_interval. 2017-11-30 22:02:07 -08:00
Gareth J. Greenaway
e4f5b3026a
Adding ability to postpone jobs usiing a simple, initial postpone function. The postpone function adds the current job time to a skip_explicit list and adds the new run time to a run_explicit list. 2017-11-30 22:02:07 -08:00
Gareth J. Greenaway
be192ff7fc
Renaming not_during_range to skip_during_range, adding now as a parameter for eval to override the current time. Adding skip_explicit to include an explicity list of times in unix time stamp format when jobs should be skipped. Adding ability to include a function that should be run if jobs are to be skipped. 2017-11-30 22:02:07 -08:00
Gareth J. Greenaway
52c2366c23
addding not_during_range to schedule 2017-11-30 22:02:06 -08:00
Nicole Thomas
5c737100c4
Merge pull request #44726 from terminalmage/issue42188
Add __context__ to RunnerClient and WheelClient
2017-11-30 19:03:02 -05:00
Thomas S Hatch
e22596aba7 update set_pause to pause and rm_pause to resume 2017-11-30 16:13:32 -07:00
Mike Place
a1cdf9ab55
Merge pull request #44756 from thatch45/mstats
Master Stats
2017-11-30 16:02:27 -07:00
Nicole Thomas
d0dad1d855
Merge pull request #44757 from terminalmage/verify_env
Fix calls to verify_env
2017-11-30 17:08:00 -05:00
Thomas S Hatch
1c50dd28ae don't allow pause on salt-ssh 2017-11-30 14:52:16 -07:00
Thomas S Hatch
ad610fb150 fix lint 2017-11-30 14:42:10 -07:00
Thomas S Hatch
467f96e564 add the ability to pause an entire state run
This sets the pause at the next state chunk that will run
regardless of where the run is right now
2017-11-30 14:31:58 -07:00
Nicole Thomas
2503a6f150
Merge branch 'develop' into verify_env 2017-11-30 14:53:35 -05:00
Thomas S Hatch
0ab85361c0 Merge branch 'mstats' of github.com:thatch45/salt into mstats 2017-11-30 11:41:49 -07:00
Thomas S Hatch
52ab561c4c Add some extra docs 2017-11-30 11:40:40 -07:00
Thomas S Hatch
bff22e5b0b fix soem bugs and make a better event tag 2017-11-30 11:35:33 -07:00
Thomas S Hatch
cb0a0d57ce Add some basic docs 2017-11-30 11:11:31 -07:00
Thomas S Hatch
2ab0f06030 clean up spurious logs etc 2017-11-30 11:06:55 -07:00