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
35,883 Commits 24 Branches 182 Tags 341 MiB
d37d7ce02e
Commit Graph

35883 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
968faf1331 Merge pull request #16127 from jacksontj/timeout_fixes 
Backport of #16078
 2014-09-26 14:37:01 -06:00
Thomas S Hatch
e26b940642 Merge pull request #16163 from gtmanfred/2014.7 
move systemd notify to process
 2014-09-26 14:22:42 -06:00
Thomas S Hatch
0d609ac14e Merge pull request #16170 from thatch45/16165 
Fix the mods path in the shim and pass mods into wfuncs
 2014-09-26 14:22:11 -06:00
Dave Rawks
58ac89dd47 Minor edit for lint 2014-09-26 12:50:18 -06:00
Dave Rawks
b41dac3072 Some improvements to parsing cmd output in list_ 
* Properly ignore "header" lines which indicate output in "CHS" or "CYL"
* Raise salt.exceptions.CommandExecutionError on unexpected parsing
	failures
* Always check for correct len of cols array before unpacking by index
 2014-09-26 12:49:14 -06:00
Dave Rawks
1ad50f7dc6 Remove use of try/except for flow control 
If the intent is to only extract the 7th column if it exists then it
makes more sense to actually test for the number of columns rather than
catch an IndexError which may occur at any of the 3 list index
operations within the try block.
 2014-09-26 12:49:06 -06:00
Dave Rawks
213c2f64e8 Renamed comps variable to cols for readability 
I'm not sure what comps is short for, but this code is definitely doing
column-wise parsing.
 2014-09-26 12:48:54 -06:00
Dave Rawks
bd978ff900 Don't execute lsblk using absolute path 
* Removed absolute path from lsblk call. Code already tests if lsblk is
in PATH, whichever lsblk satisfied that test in __virtual__ should be
the command that is called.
 2014-09-26 12:43:11 -06:00
Dave Rawks
4747b0ea73 Removed all the "os.listdir" based "checks" 
* Per #15950 comparison against output of os.listdir is not a sane way to
test for existence of block devices.
 2014-09-26 12:39:30 -06:00
Nicole Thomas
cff5b189e2 Merge pull request #16156 from rallytime/bp-16035 
Backport #16035 to 2014.7
 2014-09-26 12:04:15 -06:00
Nicole Thomas
e6f20c78dd Merge pull request #16169 from rfairburn/network-module-docs 
salt/salt/modules/network.py documentation. Added versionadded to functions new in 2014.7
 2014-09-26 11:46:44 -06:00
Nicole Thomas
7e14222fb5 Merge pull request #16172 from terminalmage/docs 
Update docs reference to Halite
 2014-09-26 11:37:35 -06:00
C. R. Oldham
18b10aef53 Merge pull request #16168 from cro/raet_key_color_20147 
Fix stacktrace in salt-key when using raet
 2014-09-26 10:55:09 -06:00
Samuel M Smith
899579439a Merge remote-tracking branch 'upstream/2014.7' into 2014.7_sam4 2014-09-26 10:20:27 -06:00
Samuel M Smith
17707f8a36 more clean up 2014-09-26 10:19:57 -06:00
Samuel M Smith
f3d97733a5 Clean up new handling RAETCHannel as per feedback 2014-09-26 10:16:41 -06:00
C. R. Oldham
75bcad9e12 Pylint fix 2014-09-26 09:34:15 -06:00
Erik Johnson
1a88ebf1f8 Update docs reference to Halite 
Halite is no longer "new", and shouldn't be referred to as such.
 2014-09-25 23:54:59 -05:00
Thomas S Hatch
cfd7dba53c use the config_dir to find the roster 2014-09-25 22:24:43 -06:00
Thomas S Hatch
f934e4130a Fix #16165, fix the mods path in the shim and pass mods into wfuncs 2014-09-25 21:41:30 -06:00
Thomas S Hatch
208837a5d3 Merge pull request #16132 from rallytime/unused_arg 
Remove unused refresh argument
 2014-09-25 21:13:05 -06:00
Robert Fairburn
e06700a044 salt/salt/modules/network.py documentation. Added versionadded to functions new in 2014.7 2014-09-25 21:56:42 -05:00
C. R. Oldham
dd1c2f8a59 Fix key coloring for raet transport. 2014-09-25 17:46:00 -06:00
Samuel M Smith
87718a63d5 Fixed comflict 
Merge remote-tracking branch 'upstream/2014.7' into 2014.7_sam4

Conflicts:
	salt/transport/__init__.py
 2014-09-25 17:41:51 -06:00
Samuel M Smith
37e7a2e283 Modified RAETChannel and Channel factory 
Channel factory now has usage argument this is used by RAETChannel to determine routing destination addressing

Fixed three usages of RAETChannel

usage == 'local_cmd'  # Used by master_call for master to master communications
usage == 'call_cmd'   # Used by salt-call for cli to master communications through minion
otherwise default usage == None  # Used by minion to master communications

The destination estate is now None for all three usages.

These usages get translated into share destinations in the route dict for raet messages

usage 'local_cmd'  -> destination share 'local_cmd'
usage 'call_cmd'   -> destination share 'call_cmd'
usage None         -> destination share 'remote_cmd'

Fixed core.py Lane Router _process_uxd_rxmsg to recognize the share destinations and
do the apppropriate routing

Mainly this allows the destination estate to be none when a RAETCHannel is created and then
the router can substitute the approapriate destination estate for the master
 2014-09-25 17:29:32 -06:00
rallytime
ec2b6346bd Ignore unused arg instead 2014-09-25 16:50:09 -06:00
Colton Myers
1450887baa Merge pull request #16162 from rallytime/skip_vt_test 
Skip test_vt_size unit test
 2014-09-25 16:35:17 -06:00
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