Pedro Algarvio
5afb59090d
Also include salt-run in the packaged scripts
2014-10-01 21:00:10 +01:00
Pedro Algarvio
ec09c5b837
Allow packaging salt-ssh as a package.
...
This works by passing `--ssh-packaging` to the `sdist` command
```
python setup.py sdist --ssh-packaging
```
2014-10-01 20:49:36 +01:00
Thomas S Hatch
7eb9ed9fb4
Merge pull request #16282 from thatch45/2014.7
...
Set the required msgpack to be above 0.3
2014-10-01 13:16:24 -06:00
Mike Place
dd4e6ff604
Handle None passwords in mysql connect
...
Closes #15195
2014-10-01 11:54:43 -06:00
Nicole Thomas
f6cce07ebd
Merge pull request #16287 from rallytime/fix_pylint
...
Fix pylint on 2014.7 again
2014-10-01 09:48:16 -06:00
rallytime
af9f440718
Fix a few pylints that I missed the first time
2014-10-01 09:05:23 -06:00
rallytime
d478feacf8
Fix pylint on 2014.7 again
2014-09-30 16:48:34 -06:00
Thomas S Hatch
acbf910d99
Merge pull request #16279 from thatch45/msgpack_gates
...
Fix for #16088
2014-09-30 16:25:21 -06:00
Thomas S Hatch
37267f76b9
Merge pull request #16276 from jacksontj/2014.7
...
Ensure that timeout will happen for jobs that don't target any alive minions
2014-09-30 16:24:19 -06:00
Thomas S Hatch
b9c33060a5
Merge pull request #16269 from bbinet/influxdb-admin-user
...
Influxdb admin user
2014-09-30 14:33:16 -06:00
Thomas S Hatch
dd66b9c855
lint
2014-09-30 14:29:30 -06:00
Nicole Thomas
de50067a91
Merge pull request #16272 from rallytime/bp-16252
...
Backport #16252 to 2014.7
2014-09-30 14:15:30 -06:00
Thomas S Hatch
52f59de09b
Merge pull request #16278 from rallytime/pylinting
...
Fix pylint on 2014.7
2014-09-30 13:57:10 -06:00
Thomas S Hatch
7cbb958613
Set the required msgpack to be above 0.3
2014-09-30 13:53:50 -06:00
rallytime
dca4ce75a8
Fix pylint on 2014.7
2014-09-30 12:00:17 -06:00
Thomas S Hatch
395e909d07
Fix for #16088
2014-09-30 11:59:27 -06:00
Thomas Jackson
d9fdc06742
Ensure that timeout will happen for jobs that don't target any alive minions
...
Instead of checking if all returns are in, we should check that the job is not running anywhere then enforce the per-minion timeout. I've added a test case for the instance where there is a job fired to a minion that will never return (before it would stall forever)
2014-09-30 10:11:55 -07: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
Steve Weber
a0c3723c96
removed the slash when using slspath
2014-09-30 10:51:36 -06:00
Steve Weber
ce92865117
added sls underscore path and removed extra slash
...
added sls underscore path and removed extra slash.
I removed the extra slash after much thought... its best to keep things consistent.
The gain by adding the slash is small.
2014-09-30 10:50:32 -06:00
Bruno Binet
e29109a59e
user_exists method should be called with full arg list
2014-09-30 16:50:47 +02:00
Bruno Binet
e2b394e4c2
db_exists method should be called with full arg list
2014-09-30 16:50:13 +02: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
