Erik Johnson
087500bde7
Add new file mode preservation feature to carbon release notes
2016-07-20 15:33:11 -05:00
Erik Johnson
44d60a3252
Allow file.managed, file.recurse states to keep server's mode for files
2016-07-20 15:33:11 -05:00
Erik Johnson
a676cdff75
Update ref to config.manage_mode
2016-07-20 15:33:11 -05:00
Erik Johnson
1c20949683
Remove code that was moved to salt.utils
2016-07-20 15:33:11 -05:00
Erik Johnson
480a4a172e
Add attributes to master's fileserver objects to point to new convenience function
2016-07-20 15:33:11 -05:00
Erik Johnson
73a156d28c
Support enforcement of file mode in RemoteClient and LocalClient
...
This code modifies the file caching code in both fileclients to request
the stat result for the desired file. If the locally-cached copy of the
file has a mode which does not match the mode retrieved from the
fileclient, then the cached copy's mode is chmod'ed to match.
2016-07-20 15:33:11 -05:00
Erik Johnson
934c6b27c6
Add a dedicated function for returning both the file hash and stat
...
Also add convenience functions that allow find_file to be invoked on a
remote FS backend by the minion via the fileclient.
2016-07-20 15:33:10 -05:00
Erik Johnson
c8795ce130
Add a couple mode-related convenience functions
2016-07-20 15:33:10 -05:00
Erik Johnson
f609011a55
Remove unnecessary 2nd except clause
...
Since the action is the same for both exceptions, a single except clause
is sufficient here.
2016-07-20 15:33:10 -05:00
Erik Johnson
af98636ebe
gitfs: Include file mode in find_file results
...
Since we're only going to be using the stat information for mode
manipulation, there is no need to waste CPU resources by stat'ing the
file. Besides, only the mode information is stored in the git metadata,
so the remaining params from a posix.stat_result would be inaccurate and
all but useless to us.
2016-07-20 15:33:10 -05:00
Erik Johnson
dbe850121f
Optimize file retrieval logging
...
logging already uses string replacement, string formatting is overkill.
It'll be a modest improvement, but more impactful on file.recurse
states which perform a lot of file downloads.
2016-07-20 15:33:10 -05:00
Erik Johnson
46e6d4005b
salt/fileserver/roots.py: add try/except to file stat
2016-07-20 15:33:10 -05:00
Erik Johnson
150f35e2c8
salt/fileserver/hgfs.py: add try/except to file stat
2016-07-20 15:33:10 -05:00
Erik Johnson
5983d990df
salt/fileserver/azurefs.py: add try/except to file stat
2016-07-20 15:33:10 -05:00
Erik Johnson
c11683b102
salt/utils/gitfs.py: add file stat to find_file
2016-07-20 15:33:10 -05:00
Erik Johnson
f8753c1aa8
salt/fileserver/svnfs.py: add file stat to find_file
2016-07-20 15:33:09 -05:00
Jorge Schrauwen
1684417cda
vmadm runner cleanup and retest
2016-07-20 22:26:11 +02:00
Joseph Hall
56838f5590
Remove unnecessary import
2016-07-20 14:16:58 -06:00
Mike Place
b55b5ea964
Don't open file in binary mode when reading network ( #34819 )
...
Corrects stacktraces in py3 compat.
2016-07-20 12:38:03 -06:00
rallytime
094731f4b6
Merge branch '2015.8' into '2016.3'
...
No conflicts.
2016-07-20 12:32:08 -06:00
Mike Place
3342b0c664
Merge remote-tracking branch 'twangboy/int_tests_cachedout' into int_tests_interfaces
2016-07-20 10:25:42 -06:00
Mike Place
98fa4a404e
Merge pull request #34818 from jtand/mysql_state_integration_test_cleanup
...
Skip mysql state test if mysqladmin is not available
2016-07-20 10:10:35 -06:00
Mike Place
ec8a6ebab3
Correct config test errors
2016-07-20 10:00:31 -06:00
Mike Place
03039c13e2
Lint
2016-07-20 10:00:31 -06:00
Mike Place
5f5d7193b0
Add interface to all configs
...
This got removed during the attempt to make the tests run on Windows.
I added them everywhere even though that's not strictly necessary.
Without these set on the master and sub_master, Windows will throw
erorrs because the networking stack will decide that anything that's
bound to 0.0.0.0 represents an extestential threat to any socket that
attempts to *connect* to one of those ports. (For...reasons.)
2016-07-20 10:00:31 -06:00
twangboy
4e56d28993
Add tcp_master settings to both masters
2016-07-20 10:00:31 -06:00
twangboy
b5b0b9ae4b
Add more info to --interactive report
2016-07-20 10:00:30 -06:00
twangboy
3833c008b2
Cleans up config parameters
2016-07-20 10:00:30 -06:00
twangboy
003e60f6c6
Add cachedir for minions and syndic
2016-07-20 10:00:30 -06:00
twangboy
81d7479dfb
Remove backtick
2016-07-20 10:00:30 -06:00
twangboy
c1ae2537f1
Remove configuration from configs
2016-07-20 10:00:30 -06:00
twangboy
68e5620b92
Check actual minion ports
...
For some reason this fixed the PYTHONPATH issue
2016-07-20 10:00:30 -06:00
twangboy
55b8ea664e
Remove redundant tcp_pull_port entry for minion
2016-07-20 10:00:30 -06:00
twangboy
79b5be6989
Add more descriptive report for interactive mode
2016-07-20 10:00:30 -06:00
twangboy
cfc82f4004
Fix lint
2016-07-20 10:00:30 -06:00
twangboy
54647eb7d8
Fix mem leak caused by pki_dir
2016-07-20 10:00:30 -06:00
twangboy
7f3f15378e
Make additional changes to master configs
2016-07-20 10:00:30 -06:00
twangboy
a33c5c15da
Fix master and sub_minion configs
2016-07-20 10:00:30 -06:00
twangboy
f55ba87bee
Fix configs, remove default values
2016-07-20 10:00:30 -06:00
twangboy
9b14dc0a6e
Add Pedro's suggestions
2016-07-20 10:00:30 -06:00
twangboy
9bc438e302
Fix subminion
2016-07-20 10:00:29 -06:00
twangboy
1805630fdc
Fix integration tests on windows
2016-07-20 10:00:29 -06:00
twangboy
f7fb4985c4
Add Pedro's suggestions
2016-07-20 10:00:29 -06:00
twangboy
785f5470fc
Fix subminion
2016-07-20 10:00:29 -06:00
twangboy
5bcb27e477
Fix integration tests on windows
2016-07-20 10:00:29 -06:00
Justin Anderson
9abb6f91bb
Skip mysql state test if mysqladmin is not available
2016-07-20 09:24:24 -06:00
Mike Place
2dc02cbb0d
Merge pull request #34792 from mollykreis/dev/mkreis/win_timezone_compatibility
...
win_timezone: Make timezones on Windows more compatibile with Linux
2016-07-20 08:52:11 -06:00
Mike Place
62ef8fdb35
Merge pull request #34670 from isbm/isbm-osmajorrelease-grain-suse
...
Add "osmajorrelease" grain (2016.3)
2016-07-20 08:39:38 -06:00
Mike Place
e30b324394
Merge pull request #34576 from eidng8/develop
...
#28085
2016-07-20 08:38:01 -06:00
Mike Place
aff29906fc
Merge pull request #34671 from isbm/isbm-osmajorrelease-grain-suse-devel
...
Add "osmajorrelease" grain
2016-07-20 08:35:34 -06:00
