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
rallytime
dca4ce75a8 Fix pylint on 2014.7 2014-09-30 12:00:17 -06:00
Samuel Smith
bb8c96d374 Merge pull request #16273 from SmithSamuelM/2014.7_sam5 
More clean up of yard naming vis a vis application kind
 2014-09-30 11:03:23 -06:00
Samuel M Smith
629789cf8f Merge remote-tracking branch 'upstream/2014.7' into 2014.7_sam5 2014-09-30 10:56:09 -06:00
Samuel M Smith
2091565f7c More cleanup for naming of yard stacks and remotes vis a vis application kind 
Also cleanup some uid yid stuff
 2014-09-30 10:54:35 -06:00
Thomas S Hatch
cc2b7edc1f Merge pull request #16259 from thatch45/ssh_fsclient_mods 
Ssh fsclient mods
 2014-09-29 23:02:02 -06:00
Thomas S Hatch
48fd56ce05 Merge pull request #16258 from thatch45/ssh_refactor_fsclient 
Change the fsclient to only be created once
 2014-09-29 23:00:44 -06:00
Thomas S Hatch
21aeecef5e Merge pull request #16242 from jacksontj/2014.7 
fix for #16240
 2014-09-29 22:54:19 -06:00
Thomas S Hatch
54bd8184c9 Use the correct refs to download the files 2014-09-29 22:51:30 -06:00
Thomas S Hatch
3e4221c443 envs is not a load passing function 2014-09-29 22:45:46 -06:00
Thomas S Hatch
742f0a527e Enable fileserver backends for extension module pushes in salt-ssh 2014-09-29 22:18:26 -06:00
Thomas S Hatch
8a01d88815 Change the fsclient to only be created once 
This allows for the fsclient to not have to re-init multiple
times with each salt-ssh call. it also allows for the fsclient to
be available for the complete execution sequence
 2014-09-29 21:06:27 -06:00
Samuel Smith
60770cf406 Merge pull request #16257 from SmithSamuelM/2014.7_sam5 
Updated consistent semantics for SaltEvent get_event factor
 2014-09-29 20:56:38 -06:00
Samuel M Smith
3d9c9869bd fMerge remote-tracking branch 'upstream/2014.7' into 2014.7_sam5 
Conflicts:
	salt/daemons/flo/core.py
	salt/utils/raetevent.py
 2014-09-29 20:54:50 -06:00
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
Thomas S Hatch
8645b750f2 Merge pull request #16256 from rallytime/pylint 
Pylint fix for 2014.7
 2014-09-29 20:05:08 -06:00
Thomas S Hatch
ea5c8518db Merge pull request #16246 from rallytime/pillar_docs 
Add note on how to set pillar data on the command line to pillar tutorial
 2014-09-29 20:03:47 -06:00
Thomas S Hatch
3ace3e1405 Merge pull request #16241 from s0undt3ch/hotfix/transifex-updates 
Update 'doc/.tx/config' - Build #166
 2014-09-29 20:02:59 -06:00
Thomas S Hatch
80571cf912 Merge pull request #16238 from cachedout/pillar_context 
Make renderers fully aware of pillar context
 2014-09-29 20:01:53 -06:00
Thomas S Hatch
41a237b845 Merge pull request #16222 from bbinet/docfix-postgres-user-update 
docfix: user_update was documented as user_create
 2014-09-29 19:59:26 -06:00
rallytime
cd7787bfe4 Pylint fix for 2014.7 2014-09-29 19:54:33 -06:00
Thomas S Hatch
81eb9064c0 Merge pull request #16216 from grischa/2014.7-novafix 
improved compatibility with different versions of novaclient
 2014-09-29 19:53:03 -06:00
Thomas S Hatch
035d20ecaf Merge pull request #16213 from terminalmage/docs 
Fix some outdated docs references
 2014-09-29 19:52:29 -06:00
Thomas S Hatch
49b3646ad6 Merge pull request #16211 from rallytime/runtests_doc 
Add info about running unittests w/o integration test daemons
 2014-09-29 19:51:05 -06:00
Nicole Thomas
0b25972c48 Merge pull request #16249 from rallytime/bp-16236 
Backport #16236 to 2014.7
 2014-09-29 18:01:40 -06:00
Thomas Jackson
98af66bbf3 Add a regression test for #16240 2014-09-29 16:37:53 -07:00
Thomas Jackson
a52d474925 Change timeout behavior to be a combination of "nothing left to ping" and "minions have all timed out" 
Before we were fighting between the regular timeout (default 5s) and the gather_jobs_timeout (default 5s), which mean that if they were the same (as they are by default) you will fire the ping job immediately as you time out the return.

This change makes it so they are sequential instead of parallel-- which is what we are really looking for anyways
 2014-09-29 16:11:50 -07:00
C. R. Oldham
a650d909d4 Merge pull request #16250 from cro/wingdb_remove 
Remove wingdbstub import
 2014-09-29 16:58:03 -06:00
C. R. Oldham
9dcaf184a1 Remove wingdbstub import 2014-09-29 16:57:09 -06:00
Ed Kern
3933cdb72a pub_sig to pubkey_sign so that the tutorial isnt broken in /doc/topics/tutorials/multimaster_pki.rst 2014-09-29 16:21:08 -06:00
Samuel Smith
30fbcfa9ca Merge pull request #16248 from SmithSamuelM/2014.7_sam5 
Cleanup up Eventer event forwarding
 2014-09-29 16:19:58 -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
rallytime
38db7b7d5e Add note on how to set pillar data on the command line to pillar tutorial 
Closes #14217
 2014-09-29 16:04:30 -06:00
Thomas Jackson
b0861d16cf Start listening for returns before firing off the ping 2014-09-29 14:56:16 -07:00
Thomas Jackson
75bf64f8bd fix for #16240 
This just exposes a but in the event class where the nonblocking function doesn't check if you have subscribed yet or not
 2014-09-29 13:38:17 -07:00
Pedro Algarvio
7763c3bd53 Update 'doc/.tx/config' - Build #166 
http://cookingwithsalt.org/job/salt/job/transifex/166/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-09-29 21:34:48 +01: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
Mike Place
a3369d11d2 Make renderers fully aware of pillar context 2014-09-29 13:41:46 -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