valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
35,756 Commits 24 Branches 182 Tags 341 MiB
dca4ce75a8
Commit Graph

35756 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
2f524b638c Merge pull request #16159 from thatch45/passwd_fix 
Add passwd opts checking to key_opts
 2014-09-25 16:09:06 -06:00
Thomas S Hatch
62185d922b fix bad naming 2014-09-25 16:08:41 -06:00
Daniel Wallace
822e4395ed move systemd notify to process 2014-09-25 16:46:27 -05:00
rallytime
b891ef12f0 Skip test_vt_size unit test 2014-09-25 15:38:01 -06:00
Samuel M Smith
732fc46787 Assign master_name opt for proc_run on minion 
so have valid destination
 2014-09-25 14:44:18 -06:00
Thomas S Hatch
8c4ff791a7 Add passwd opts checking to key_opts, fix #16147 2014-09-25 13:44:48 -06:00
Pedro Algarvio
227c62b4ee Merge pull request #16149 from rallytime/improve_loader_test 
Fix linode test failures and test all modules
 2014-09-25 20:38:06 +01:00
Thomas S Hatch
954cb16a3f warn for config 2014-09-25 13:30:20 -06:00
Wolodja Wentland
4dcf2da38f Ensure that mount.mounted modifies entries in fstab on changes 
mount.mounted compared entries in fstab only by their fs_spec to determine if an
entry that is about to be added was already present and that the original one
should therefore be modified. It is, however, necessary to compare both fs_spec
and fs_file fields to allow users to mount new filesystems or block devices to
the same mountpoint.

This fixes #15968 which had already been fixed in #9573 but was re-introduced in
c8c6112 due to, what I believe, not rebasing that PR against develop.
 2014-09-25 13:21:06 -06:00
Colton Myers
c852843931 Merge pull request #16151 from rallytime/fix_ssh_test 
Fix jenkins - Skip ssh grains test for now.
 2014-09-25 13:08:08 -06:00
Colton Myers
8a10efb558 Merge pull request #16143 from s0undt3ch/hotfix/bootstrap-script 
Update to latest stable bootstrap script v2014.09.25
 2014-09-25 12:53:04 -06:00
rallytime
210adceeff Actually, just fix pylint 2014-09-25 12:36:00 -06:00
rallytime
e2dce8acba Skip ssh grains test for now. Test environment isn't set up to handle it. 2014-09-25 11:47:44 -06:00
rallytime
ac40a5b2da Fix linode test failures and test all modules 2014-09-25 11:34:50 -06:00
Pedro Algarvio
d8905c71e5 Update to latest stable bootstrap script v2014.09.25 
* Properly detect Amazon AMI's >= 2014.9. saltstack/salt-bootstrap#468
 2014-09-25 16:46:28 +01:00
Thomas S Hatch
bc2a897c3e Merge pull request #16063 from jacksontj/2014.7 
2014.7 RC fixes/backports
 2014-09-25 09:03:06 -06:00
Thomas S Hatch
0034ebee6f Merge pull request #16133 from mzdaniel/16129-salt-ssh 
salt-ssh, issue #16129
 2014-09-25 08:46:43 -06:00
Thomas S Hatch
794daea392 Merge pull request #16125 from thatch45/hg_inputs 
reformat hg command inputs
 2014-09-25 08:43:09 -06:00
Pedro Algarvio
68732d5df6 Merge pull request #16134 from terminalmage/docs 
Grammar correction in salt.states.quota docstring
 2014-09-25 08:21:42 +01:00
Erik Johnson
e5fc86817b Grammar correction in salt.states.quota docstring 2014-09-24 23:43:47 -05:00
Daniel Mizyrycki
22df8018cd salt-ssh, issue #16129: 
Fix a salt-ssh issue affecting grains and pillar subsystems.
 2014-09-24 20:58:37 -07:00
Daniel Mizyrycki
e0c6c8c22a salt-ssh, issue #16129: 
Add integration/regression test for issue affecting grains and pillar subsystem.
 2014-09-24 20:58:37 -07:00
Thomas S Hatch
76fa2b67a3 Merge pull request #16117 from thatch45/16088 
msgpack is conditional in the thin tarball
 2014-09-24 21:23:52 -06:00
Thomas S Hatch
884f4df787 lint fix 2014-09-24 21:22:36 -06:00
rallytime
4830b4773a Remove unused refresh argument 
Closes #16118
 2014-09-24 21:01:28 -06:00
Thomas S Hatch
c66a222827 Merge pull request #16122 from rallytime/pylint 
Pylint fix
 2014-09-24 20:14:56 -06:00
Thomas S Hatch
dfde5eac5a Merge pull request #16116 from cachedout/better_auth_failure_message 
Better fail message.
 2014-09-24 20:13:29 -06:00
Thomas S Hatch
b043c150ab Merge pull request #16113 from cachedout/issue_15693 
Error handling in broken SLS file.
 2014-09-24 20:11:58 -06:00
Thomas S Hatch
c555fed654 Merge pull request #16108 from rallytime/azure_errors 
Improve error reporting when creating a vm name with a '.'
 2014-09-24 20:11:20 -06:00
Thomas S Hatch
ad42cd1670 Merge pull request #16102 from cachedout/issue_16073 
Catch invalid saltenv
 2014-09-24 20:09:43 -06:00
Thomas Jackson
87f43bbedd Typo fix 2014-09-24 16:16:10 -07:00
Thomas Jackson
43778338cd Add a timeout to get_event_iter_returns, the old implementation won't timeout if the event buss is relatively busy 2014-09-24 16:16:04 -07:00
Thomas Jackson
0d0f3e63af Start pinging minions after TIMEOUT, instead of immediately 2014-09-24 16:15:51 -07:00
Thomas Jackson
3773b02489 Pylint cleanup 2014-09-24 16:15:45 -07:00
Thomas Jackson
295afba5f8 Rework of more_time feature 
In the past this feature has basically checked returns, pinged minions if they were still running the job, then returning once the job was no longer run remotely. This has caused some issues with race conditions if the minion or master are busy (and the time between minion done, and master recieved gets large).

This changes the behavior of the "wait" mechanism. The intent of this feature is to wait for the job return from all minions the job went to. To accomplish this we fire the job, then check the returns. If the initial returns are what we wanted/expected we break. If it isn't we will ping all targets and see if its still running. If more minions return, we merge them into the list of minions we are waiting for. We will timeout the job once all minions have stopped running the job and TIMEOUT seconds have passed (since the slowest minion)

Conflicts:

	salt/client/__init__.py
 2014-09-24 16:15:36 -07:00
Thomas S Hatch
ce68cfa811 reformat hg command inputs 2014-09-24 16:43:32 -06:00
rallytime
276e7912d9 Pylint fix 2014-09-24 16:21:33 -06:00
Thomas S Hatch
384588d500 Merge pull request #16103 from thatch45/16066 
Make the error more concise for wfunc per denies
 2014-09-24 16:09:18 -06:00
Thomas S Hatch
928d2b61d1 Merge pull request #16104 from thatch45/16071 
Fix #16071
 2014-09-24 16:08:41 -06:00
Thomas S Hatch
48cda23b82 the thin tarball should not NEED msgpack, but it is good to have 2014-09-24 16:06:12 -06:00
Mike Place
0f7cbf2dc0 Better fail message. 
If you're using salt-call for the first time and don't pass --local, the
message 'Failed to sign in' is kind of confusing. This makes it a little
more clear about what the problem really is.
 2014-09-24 16:03:17 -06:00
Samuel Smith
dd2642b247 Merge pull request #16114 from SmithSamuelM/2014.7_sam4 
Refactor application kind Also clean up routing logic a little
 2014-09-24 15:05:34 -06:00
Samuel M Smith
209561ddb1 Merge remote-tracking branch 'upstream/2014.7' into 2014.7_sam4 2014-09-24 15:00:50 -06:00
Samuel M Smith
0675f23bf6 Refactored name of application kind (type) to kind 2014-09-24 14:59:42 -06:00
Mike Place
a0b6c586d1 Error handling in broken SLS file. 
Closes #15693
 2014-09-24 14:57:49 -06:00
rallytime
efcdfcf8f2 Improve error reporting when creating a vm name with a '.' 2014-09-24 14:13:04 -06:00
Thomas S Hatch
6d40875d7f Merge pull request #16082 from thatch45/16064 
Fix #16064
 2014-09-24 12:44:53 -06:00
Thomas S Hatch
103016bf66 Merge pull request #16080 from thatch45/16061 
Add master opts to the loader
 2014-09-24 12:44:38 -06:00
Thomas S Hatch
074448bd56 Fix #16071 2014-09-24 12:43:44 -06:00
Thomas S Hatch
2669a09c97 Make the error more concise for wfunc per denies 
this should fix #16066
 2014-09-24 12:37:26 -06:00