Commit Graph

50354 Commits

Author SHA1 Message Date
Thomas Jackson
21624eb20e Remove all final references to self.socket from minion.py 2015-04-07 20:53:21 -07:00
Thomas Jackson
d406b2e1da Add "socket" interface to pub_channel, so we can wire it into regular pollers 2015-04-07 20:53:21 -07:00
Thomas Jackson
7bbfba2797 More migration to PubChannel 2015-04-07 20:53:20 -07:00
Thomas Jackson
645eaf084b Cleanup print from debugging 2015-04-07 20:53:20 -07:00
Thomas Jackson
87fb069e05 Implement timeout for PubChannel.recv() 2015-04-07 20:53:20 -07:00
Thomas Jackson
3290c32659 Remove some unused imports 2015-04-07 20:53:20 -07:00
Thomas Jackson
064896d4d9 Update commented out version as well 2015-04-07 20:53:20 -07:00
Thomas Jackson
e376b283ef Refactor the start_daemon function 2015-04-07 20:53:20 -07:00
Thomas Jackson
403c81c2a6 Move daemon init and execution into the same process.
These daemon processes aren't all thread safe, so having the test suite init then fork is disingenuous since that isn't supported anyways.
2015-04-07 20:53:20 -07:00
Thomas Jackson
8996493152 Misc cleanup after rebase 2015-04-07 20:53:20 -07:00
Thomas Jackson
62d9d3cdad Switch remaining uses of sreq to channel 2015-04-07 20:53:20 -07:00
Thomas Jackson
7c93360a82 More work to remove minion.authenticate() 2015-04-07 20:53:20 -07:00
Thomas Jackson
fa94083acc Consolidate socketopts into channel 2015-04-07 20:53:07 -07:00
Thomas Jackson
e8b31057f8 Rebase in current develop, and add in recv_noblock 2015-04-07 20:53:07 -07:00
Thomas Jackson
ce04827fa4 A few hacks to get some basic pubchannel working 2015-04-07 20:53:07 -07:00
Thomas Jackson
3bf28b1bb5 Refactor channel classes to have separate pub/req channels 2015-04-07 20:51:26 -07:00
Justin Findlay
54ce98a92b Merge pull request #22438 from garethgreenaway/http_return_code_cleanup
HTTP Return Code Cleanup
2015-04-07 16:34:54 -06:00
Nicole Thomas
408cfb223f Merge pull request #22424 from jfindlay/network_tests
add wake-on-lan unit tests
2015-04-07 15:45:47 -06:00
Gareth J. Greenaway
e6b847eca8 Swapping out hardcoded HTTP return code numbers for their values from salt.ext.six.moves.http_client. Some typos in some documention for returners. 2015-04-07 14:17:24 -07:00
Thomas S Hatch
2ceea0e3c7 Merge pull request #22430 from cachedout/display_docs
Display documention when the CLI gets bad function args
2015-04-07 14:50:20 -06:00
Justin Findlay
2ef39ed380 add wake-on-lan unit tests 2015-04-07 14:41:28 -06:00
Thomas S Hatch
caff269555 Merge pull request #22421 from terminalmage/docker-ng
docker-ng module updates
2015-04-07 14:38:43 -06:00
Thomas S Hatch
5643c7f33b Merge pull request #22432 from cachedout/minion_lint
Minion lint
2015-04-07 14:12:45 -06:00
Thomas S Hatch
55f4348103 Merge pull request #22428 from garethgreenaway/adding_ps_beacon
ps beacon
2015-04-07 14:10:58 -06:00
Justin Findlay
52ab4f6bf4 Merge pull request #22429 from tsaridas/iam_create_access_keys
create_access_key
2015-04-07 13:52:21 -06:00
Mike Place
4e6ed60c01 Lint 2015-04-07 13:51:10 -06:00
Thomas S Hatch
ff04f1030e Merge pull request #22414 from syphernl/fix/proxmox_kvm
Cloud: Do not look for disk underneath config in Proxmox driver
2015-04-07 13:13:54 -06:00
Mike Place
e95e533cf9 Minion lint
Create excecptions for a few format handlers. Tested in py2 and py3.
2015-04-07 13:13:32 -06:00
Mike Place
83c69b6bde Display documention when the CLI gets bad function args 2015-04-07 12:45:56 -06:00
Nicole Thomas
9120d7d63c Merge pull request #22423 from terminalmage/state-change-reporting
Remove reference to package changes
2015-04-07 12:42:13 -06:00
Andrea-Redi Tsarida
c26088bd62 create_access_key 2015-04-07 20:41:06 +02:00
Gareth J. Greenaway
9ebcdeae4a Adding a beacon to monitor if processes are running or not running, depending on value passed, then fire an event. 2015-04-07 11:31:15 -07:00
Thomas S Hatch
907ec24a20 Merge pull request #22422 from garethgreenaway/22415_gpg_module_fixes
Fixes to gpg module
2015-04-07 12:28:59 -06:00
Erik Johnson
8ef2406fc1 Lint fixes 2015-04-07 13:17:31 -05:00
Erik Johnson
d9f082a56e Remove extraneous comment 2015-04-07 12:43:56 -05:00
Frank Klaassen
6cfaeda3a7 Lint 2015-04-07 19:34:42 +02:00
Erik Johnson
d0d6770478 Remove reference to package changes
pkg states are no longer the only ones that use the "old"/"new"
dictionary method of reporting changes. This change to our logging
removes the reference to packages being changed, to reduce confusion.
2015-04-07 12:18:30 -05:00
Gareth J. Greenaway
057677e521 Fixing the case where user=salt and trust_key attempts to run the gpg binary as the user salt, which doesn't exist. Instead we set the homeDir as config-location/gpgkeys and run the command as root. Also updating documention to reflect location for default 'salt' controlled GPG keys as config-location/gpgkeys rather than config-location/gpg 2015-04-07 10:18:17 -07:00
Erik Johnson
57a6b32c99 Add IP address validation functions to salt.utils.network 2015-04-07 12:14:56 -05:00
Erik Johnson
5c2d621cd1 Add input validation, bugfixes
Also changed input format for several items in the create/start
functions to make it more like the Docker CLI (and also easier to
compare in the states).
2015-04-07 12:14:48 -05:00
Erik Johnson
fdf0c1b280 Add new functions to assist with docker state/module 2015-04-07 12:14:42 -05:00
Thomas S Hatch
7c5403613b Merge pull request #22398 from cachedout/catch_failed_engine
Catch and log failed engine starts
2015-04-07 09:34:23 -06:00
Frank Klaassen
26342424ed Do not look for disk underneath config 2015-04-07 17:12:44 +02:00
Thomas S Hatch
8c2878cacd Merge pull request #22347 from tsaridas/boto_cfn
Boto cfn
2015-04-07 09:10:25 -06:00
Mike Place
668fa35e00 Lint 2015-04-07 08:32:54 -06:00
Nicole Thomas
5d2d040d79 Merge pull request #22413 from rallytime/merge-22397
Merge #22397 with pylint fix
2015-04-07 08:07:45 -06:00
rallytime
012853a1c6 Whitespace fix 2015-04-07 07:36:43 -06:00
Mike Place
775b3dc791 Catch and log failed engine starts 2015-04-06 19:05:26 -06:00
Mike Place
dd080aaa9b More overstate deprecation warnings 2015-04-06 19:00:37 -06:00
Justin Findlay
305ce35a09 Merge pull request #22394 from nmadhok/vmware-extra_config
Adding ability to vmware cloud create() so extra_config can be specified
2015-04-06 17:51:59 -06:00