Commit Graph

96611 Commits

Author SHA1 Message Date
Dmitry Teselkin
e7959fc6b9 Check file_recv_max_size early
Current behaviour of cp.push is that salt master checks file_recv_max_size
during file transfer process. Given that by default this limit is
about 100MB if we try to send 101MB then 100MB would be sent anyway,
and only after that master interrupts the transfer. Such useless
transfers should be avoided.

This commit adds additional field 'size' to 'load' structure that
minion sends to master, transfrerring file size in every message,
so that master can check the size recieving just the first chunk
of data, saving the queue bandwith.
2018-07-31 09:32:32 +03:00
Daniel A. Wozniak
9b462394b2
Fix unicode directory listing on py2 2018-07-30 18:55:48 -07:00
David Murphy
2f3de8fa0a Changed Solaris default for disk.usage to 1 K blocks 2018-07-30 18:13:28 -06:00
Daniel Wozniak
69f81214d1
Merge pull request #48714 from dwoz/state_echo_fix
Always transfer bytes from fileserver roots
2018-07-30 15:37:12 -07:00
Nicole Thomas
6500770fa9
Merge branch 'develop' into fluorine-deprecations-win_powercfg 2018-07-30 16:38:21 -04:00
Nicole Thomas
16ca4ec2eb
Merge pull request #48822 from Ch3LL/ssh_2018_id
Fix salt-ssh state.sls_id TypeError key must be a string
2018-07-30 16:29:28 -04:00
David Wagner
182736372e Add tests for watchdog beacon. 2018-07-30 21:36:15 +02:00
David Wagner
5f3e3f4766 Add watchdog beacon for cross platform file monitoring.
Resolves #28135
2018-07-30 21:36:15 +02:00
Daniel A. Wozniak
ce3ed43dab
Always use unix line endings 2018-07-30 11:41:58 -07:00
rallytime
a89ecb00f6
Remove deprecation warning in win_powercfg module 2018-07-30 14:24:28 -04:00
rallytime
4a51ed6ccf
Remove deprecation warnings for "no_chown" option
The `no_chown` option in various functions was marked for removal in
Fluorine. This PR removes those warnings and updates the releaes notes
accordingly.

This PR also updates some of the Fluorine references in the zfs module
as the documentation can be more specific.
2018-07-30 13:24:38 -04:00
Ch3LL
01f6a15da0
Fix salt-ssh state.sls_id TypeError key must be a string 2018-07-30 13:10:54 -04:00
Nicole Thomas
05f5aab2d7
Merge pull request #48631 from gtmanfred/rfc
[RFC] add rfc for loader changes in Fluorine
2018-07-30 12:17:00 -04:00
rallytime
f46d4e0a26
[develop] Fluorine deprecations in cloud util (and related functions)
Since `Fluorine` was misspelled in a couple of places and subsequently fixed,
the removal of the `cache_nodes_ip` function was missed.

This PR removes the deprecated `cache_nodes_ip` function from salt.utils.cloud.

This PR also updates some of the warn_util versions to match the removal/support
warning message. The `warn_util` version was set to `Fluorine`, but the "will be
removed in version" message stated Sodium. Sodium is the correct version, so the
docs and warn_util versions have been corrected.
2018-07-30 11:46:13 -04:00
pengyao
8029ad45f0 Fix parse_cookie_header function cookie name always None
parse_cookie_header function is used when backend is tornado. But cookie
name is always None, because programe not set name correct value
2018-07-30 11:34:46 +08:00
Bo Maryniuk
b00ee5feef Update clean clause 2018-07-29 22:06:32 +02:00
Bo Maryniuk
b1b2e9c222 Remove multiple returns and combine logic to just one clause 2018-07-29 21:46:21 +02:00
Bo Maryniuk
fd77f760ee Rephrase explanatory comment 2018-07-29 21:45:40 +02:00
Bo Maryniuk
1031e06443 Remove unnecessary code 2018-07-29 21:45:08 +02:00
Bo Maryniuk
c379b7e4ed Get rid of global variable 2018-07-29 21:44:46 +02:00
Wang Dongxiao
74f441ba9a
fix cmd.retcode works diff from cmd.run 2018-07-28 21:14:12 +08:00
Nicole Thomas
488f6716d4
Merge pull request #48791 from rallytime/bp-48757
Back-port #48757 to 2018.3
2018-07-27 17:30:43 -04:00
Nicole Thomas
fae29f4257
Merge pull request #48799 from rallytime/merge-2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
2018-07-27 17:30:12 -04:00
Nicole Thomas
8c206a505d
Merge pull request #48800 from rallytime/merge-develop
[develop] Merge forward from 2018.3 to develop
2018-07-27 17:29:48 -04:00
Ch3LL
41e3d17f29
Use brew path from which cmd in mac_brew module 2018-07-27 15:21:52 -04:00
Nicole Thomas
6fcc57c971
Merge pull request #48797 from rallytime/stale-config-update
Reduce the number of days an issue is stale by 10
2018-07-27 14:05:03 -04:00
Nicole Thomas
73ec7fbb24
Merge pull request #48617 from alexvasiu/dev/avasiu/add_ethercat_support
modules/nilrt_ip.py: Add EtherCAT Support
2018-07-27 14:01:43 -04:00
Nicole Thomas
bd67d2a805
Merge pull request #48765 from FedericoCeratto/fix_mine.get_not_returning_data
[2018.3] Fix mine.get not returning data
2018-07-27 14:01:05 -04:00
Nicole Thomas
ac5f5d4436
Merge pull request #48794 from rares-pop/dev/iepopr/fix-salt.utils.process-catch-keyerror
Fix salt.utils.process.py set_pidfile regression
2018-07-27 13:20:40 -04:00
Nicole Thomas
d6f59aab70
Merge pull request #48494 from rallytime/fix-40532
Deprecate 'master_shuffle' in favor of 'random_master'
2018-07-27 13:19:35 -04:00
Daniel Wozniak
d5e60090bc
Merge pull request #2 from terminalmage/state_echo_fix
Simplify file contents in roots fileserver test
2018-07-27 10:07:02 -07:00
Mike Place
c936aaa64d
Merge branch 'develop' into proxycaller 2018-07-27 10:26:53 -06:00
rallytime
487458ad4b
Update old utils paths to use new utils paths 2018-07-27 11:57:34 -04:00
rallytime
5a22d28c83
Merge branch '2018.3' into 'develop'
Conflicts:
  - salt/modules/state.py
  - salt/utils/http.py
  - tests/integration/modules/test_state.py
2018-07-27 11:53:34 -04:00
rallytime
436510796f
Merge branch '2017.7' into '2018.3'
No conflicts.
2018-07-27 11:44:07 -04:00
Erik Johnson
52fc1c955d
Simplify file contents in roots fileserver test
This removes the need to hard code contents in the test. The roots
fileserver just reads from the file in binary mode, so we should be able
to do the same in the test to confirm the correct behavior of the roots
backend.
2018-07-27 09:16:59 -05:00
Erik Johnson
b6f73e8e57
Remove trailing whitespace on what should be a blank line 2018-07-27 09:15:05 -05:00
Alexandru Vasiu
354e664746 modules/nilrt_ip.py: Fix argument for function _load_config
Signed-off-by: Alexandru Vasiu <alexandru.vasiu@ni.com>
2018-07-27 17:07:56 +03:00
Nicole Thomas
8e61f3dce0
Merge pull request #48742 from frogunder/45014
add windows integration tests for states.file
2018-07-27 09:57:26 -04:00
rallytime
13d0a7cea8
Reduce the number of days an issue is stale by 10 2018-07-27 09:43:20 -04:00
Ch3LL
d3b7f2cb18
Remove fake su used in integration tests 2018-07-27 09:36:23 -04:00
Nicole Thomas
d74f47b340
Merge pull request #48795 from rallytime/fix-48417
Update linting docs to contain .testing.pylintrc use
2018-07-27 09:34:12 -04:00
Nicole Thomas
5afd64ee85
Merge pull request #48736 from cbosdo/virt-running
Update existing VMs in virt.running
2018-07-27 09:33:58 -04:00
Nicole Thomas
fe66023cc2
Merge pull request #48681 from Arabus/add-config-items-function
Add query current minion config with config.items
2018-07-27 09:28:58 -04:00
rallytime
5123b17ffd
Update linting docs to contain .testing.pylintrc use
The PR tests use the ``.testing.pylintrc`` file, rather than the
more restrictive ``.pylintrc`` file. This can be a point of confusion
when following the current documentation.

The docs should reference the testing file and that the Jenkins PR
tests use ``.testing.pylintrc`` instead of ``.pylintrc``.

Fixes #48417
2018-07-27 09:09:28 -04:00
Rares POP
1008d2717a
Fix salt.utils.process.py regression
Doing a pwd.getpwnam() will raise a KeyError
exception that is not catched anymore, after
a change that happened in 2012. Do catch that.

Signed-off-by: Rares POP <rares.pop@ni.com>
2018-07-27 16:03:02 +03:00
Federico Ceratto
7183a6e0e8 Workaround for #48020 2018-07-27 09:48:46 +00:00
Cédric Bosdonnat
8f3f593dc1
Rename states/test_libvirt.py into states/test_virt.py
Modules test files are named after the module itself, the state virt
module needs to comply with that rule too.
2018-07-27 09:27:45 +02:00
Cédric Bosdonnat
2a5f6ae5d6
Updating running domains in virt.running
So far virt.running does nothing if the corresponding domain is already
defined. Use the new virt.update function to change the domain
configuration.
2018-07-27 09:27:45 +02:00
Cédric Bosdonnat
333d14936c
Add virt.update function
User need to be able to update an existing virtual machine definition.
This function changes the definition for the next start of the VM and
tries hard to live update the virtual machine.
2018-07-27 09:27:44 +02:00