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,716 Commits 24 Branches 182 Tags 341 MiB
30b32ba5d7
Commit Graph

35716 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Samuel M Smith
30b32ba5d7 Updated consistent semantics for SaltEvent get_event factor 
node is application kind which is provided by opts['__role']
the values of application kind are 'master, 'minion', 'syndic', 'call'
This allows RAETEvent to set up its lanename correctly
on a master the manor lanename is always 'master'
on a minion the manor lanename is derived from the opts['id']
In general opts should be passed to get_event when possible salt_cloud is the exception for now
This means that can never have two masters running on the same host unless all the directories are
made unique such as cachedir and sockdir
but multiple minions can run on the same host
 2014-09-29 20:47:16 -06:00
Samuel M Smith
f5b93eed2f Merge remote-tracking branch 'upstream/2014.7' into 2014.7_sam5 2014-09-29 16:17:50 -06:00
Samuel M Smith
b5fd2ba04d Cleaned up event forwarding. No longer nests inside spurious message just forwards event msg as is 2014-09-29 16:16:48 -06:00
Thomas S Hatch
1da2389a89 Merge pull request #16193 from thatch45/SmithSamuelM-2014.7_sam4 
Merge #16177
 2014-09-29 14:02:48 -06:00
Nicole Thomas
ffeb0358f7 Merge pull request #16231 from rallytime/bp-16144 
Backport #16144 to 2014.7
 2014-09-29 13:25:53 -06:00
Thomas S Hatch
4aed486d64 Merge pull request #16224 from thatch45/keygen_fallback 
If the minion keypair does not exist, generate it
 2014-09-29 13:20:58 -06:00
Thomas S Hatch
0cff0bdc43 Merge pull request #16226 from thatch45/2014.7 
First fix for #16106
 2014-09-29 13:02:34 -06:00
Pedro Algarvio
af2434f8de Merge pull request #16232 from terminalmage/unity-manpage 
Add unity manpage to buildpackage spec
 2014-09-29 19:40:02 +01:00
Erik Johnson
e37b337a56 Add unity manpage to buildpackage spec 
This fixes automated package builds in jenkins
 2014-09-29 13:35:50 -05:00
Samuel M Smith
2d24baec3b added comment 2014-09-29 12:30:29 -06:00
Matthew Williams
dc8619280c lxc module: don't reinvent the wheel -- use lxc-attach built-in args for env and use pipes.quote instead of manual quoting 2014-09-29 12:21:04 -06:00
Matthew Williams
9fbd4c949e avoid creating unparseable lxc config param: lxc.network.mac 2014-09-29 12:21:04 -06:00
Samuel M Smith
08ca85122c Removed debug stuff 2014-09-29 12:07:46 -06:00
Samuel M Smith
ff0677c9a4 Fixed issue where get_returns_no_block was excepting if raw was None 
Fixed issue where RAETEvent.get_event_noblock was not looking at
enclosed event in msg
 2014-09-29 12:00:52 -06:00
Thomas S Hatch
c98d0304e9 First fix for #16106 2014-09-29 11:37:03 -06:00
Thomas S Hatch
e33adfd2b6 If the minion keypair does not exist, generate it 
Catches a bug where salt-call doe snot gen the key
 2014-09-29 10:35:18 -06:00
Samuel M Smith
d3ed1d8cf4 Merge remote-tracking branch 'upstream/2014.7' into 2014.7_sam4 2014-09-29 10:21:26 -06:00
Samuel M Smith
5e85f28a98 Added debug statement 2014-09-29 10:20:51 -06:00
Pedro Algarvio
47090b472b Merge pull request #16214 from rallytime/pylint 
Pylint fix for 2014.7 branch
 2014-09-29 00:08:51 +01:00
rallytime
9da5a370f5 Pylint fix for 2014.7 branch 2014-09-28 14:17:58 -06:00
Joseph Hall
f817def57b Merge pull request #16199 from terminalmage/docs 
RST formatting fixes
 2014-09-27 05:36:36 -06:00
Erik Johnson
aaf1aa62c0 RST formatting fixes 2014-09-26 23:25:42 -05:00
Samuel Smith
662d3d50ef Merge pull request #16177 from SmithSamuelM/2014.7_sam4 
Clean up RAETChannel changes to support different usages
 2014-09-26 19:41:08 -06:00
Samuel M Smith
d34e8867b7 Merge remote-tracking branch 'upstream/2014.7' into 2014.7_sam4 2014-09-26 19:38:02 -06:00
Thomas S Hatch
2f82e80293 Merge pull request #16192 from rallytime/stock_conf 
Touch up formatting in master/minion stock conf
 2014-09-26 16:49:04 -06:00
Thomas S Hatch
48d776be48 lint 2 2014-09-26 16:08:30 -06:00
Thomas S Hatch
99988a424f Lint 1 2014-09-26 16:07:57 -06:00
Thomas S Hatch
b6f88653a9 Merge branch '2014.7_sam4' of https://github.com/SmithSamuelM/salt into SmithSamuelM-2014.7_sam4 2014-09-26 16:07:18 -06:00
rallytime
4402fd80fb Clean up formatting of minion stock conf file 2014-09-26 15:38:49 -06:00
rallytime
33369370d9 Clean up formatting of master stock conf file 2014-09-26 15:15:40 -06:00
Thomas S Hatch
34223e4aab Merge pull request #16186 from rallytime/bp-16077 
Backport #16077 to 2014.7
 2014-09-26 14:59:50 -06:00
Thomas S Hatch
5e95bf7d51 Merge pull request #16171 from thatch45/16075 
Use the config_dir to find the roster
 2014-09-26 14:57:03 -06:00
Thomas S Hatch
0168f6c5ee Merge pull request #16157 from thatch45/pillar_opts 
Deprecate pillar_opts being True warnings
 2014-09-26 14:48:56 -06:00
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