valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
101,084 Commits 24 Branches 182 Tags 341 MiB
e09be8425b
Commit Graph

15761 Commits

Author SHA1 Message Date
twangboy
74ab4d3792
Use old way to get osrelease if new way fails 2019-03-27 17:03:13 -06:00
Daniel Wozniak
7040643a82
Merge pull request #52172 from garethgreenaway/51959_fix_acl_present_output 
[2018.3] Changes to linux_acl state.
 2019-03-27 15:51:52 -07:00
Daniel Wozniak
7b2b5217bf
Merge pull request #51963 from DSRCorporation/bugs/49147_ipc_subscriber 
Allow multiple instances of IPCMessageSubscriber in one process
 2019-03-27 15:48:55 -07:00
Shane Lee
87bb513d63 Fix failing symlink test (#52145) 2019-03-27 14:58:57 -06:00
Dmitry Kuzmenko
cc46e9c498
Merge branch '2018.3' into bugs/49147_ipc_subscriber 2019-03-27 23:37:31 +03:00
Dmitry Kuzmenko
23733bde5a
Regression test for parallel IPCMessageSubscriber support 2019-03-27 23:33:10 +03:00
twangboy
a5fa99a5c2
Add missing **kwargs 2019-03-27 11:33:32 -06:00
twangboy
7e88d0478a
Add the ability to pass a timeout to beacons 
Update the tests to pass a longer timeout of 300 seconds, the default is
30
 2019-03-27 11:33:32 -06:00
Wayne Werner
28c29459c8
keep_pillar not needed 2019-03-26 20:09:22 -05:00
Wayne Werner
f2aebf9cb5
Assume file contents are binary 
Try to encode as unicode, but if not, just fall back to binary.
That's probably what the data was in the first place.
 2019-03-26 19:41:47 -05:00
Wayne Werner
2b8c782891
Test gpg render with replace newlines 2019-03-26 19:41:40 -05:00
Wayne Werner
c4b385b92a
Allow binary pillar data 
There's no real reason that pillars can't/shouldn't be able to
contain binary data. This gives us the ability to say that it's OK.
 2019-03-26 19:41:33 -05:00
Wayne Werner
604b671ef9
Return binary data from gpg renderer 
If we receive binary data, we should respond with binary data.
 2019-03-26 19:41:26 -05:00
Gareth J. Greenaway
11cd485a8b
Merge branch '2018.3' into merge-2019.2 
Conflicts:
   - doc/topics/installation/freebsd.rst
 2019-03-25 13:42:28 -07:00
Gareth J. Greenaway
4908ed3048
Merge branch '2017.7' into merge-2018.3 2019-03-25 13:28:15 -07:00
Megan Wilhite
34d601e902
Merge branch '2019.2' into merge-2019.2 2019-03-22 16:38:07 -04:00
Gareth J. Greenaway
8c53890222
Merge branch '2018.3' into 51959_fix_acl_present_output 2019-03-22 10:22:48 -07:00
Gareth J. Greenaway
0bdde94ea3
Merge branch '2018.3' into 51959_fix_acl_present_output 2019-03-21 10:12:36 -07:00
Clint Armstrong
5c99dbdf1a
add test to expose ip not added to custom network #51723 2019-03-21 10:05:45 -04:00
Pedro Algarvio
cc6fb4662a
Additionally ignore files in nox virtualenvs and CI artifacts directories 2019-03-21 11:32:39 +00:00
Gareth J. Greenaway
1aa1bd8edc
Merge branch '2017.7' into merge-2018.3 
Conflicts:
  - tests/integration/modules/test_shadow.py
 2019-03-20 14:28:14 -07:00
twangboy
c874831ef4
Don't set the domain grain to windowsdomain 2019-03-20 08:52:21 -06:00
Pedro Algarvio
981335a177
Revert "Avoid a traceback on tornado.testing test classes" 
This reverts commit dce4ffab35.
 2019-03-20 14:09:45 +00:00
Pedro Algarvio
b039cec21a
Windows now has a static requirements file and no longer needs hacks 2019-03-20 14:02:51 +00:00
twangboy
65eb461071
Add a test for windows grains 2019-03-19 15:40:56 -06:00
Pedro Algarvio
dce4ffab35
Avoid a traceback on tornado.testing test classes 
https://gist.github.com/s0undt3ch/9298a69a3492404d89a832de9efb1e68

This only happens when XML reporting is enabled.
Why only now, I have no clue.
 2019-03-18 15:39:10 +00:00
Pedro Algarvio
55e150cef9
Proper setup and teardown 2019-03-17 18:30:44 +00:00
Ch3LL
c6ba2e605e
Fix lint for test_win_file 2019-03-15 10:55:22 -04:00
Ch3LL
9ada8d9b7f
Merge branch '2018.3' into '2019.2' 
Conflicts:
  - salt/transport/zeromq.py
  - tests/unit/modules/test_kubernetesmod.py
  - tests/unit/modules/test_win_file.py
 2019-03-14 16:13:54 -04:00
Gareth J. Greenaway
bfdb6691ff
Updating the reverse octal lookup dictionary. Updating tests. 2019-03-14 10:21:42 -07:00
Gareth J. Greenaway
4b99afa819
Fixing the output when there are changes for the ACL state so the permissions are shown and not the octal number. 2019-03-13 17:27:39 -07:00
twangboy
83bed46a60
Add missing symlink test 2019-03-11 15:52:55 -06:00
Gareth J. Greenaway
4a126b3c5b
Merge branch '2019.2' into 52036_rsync_state_no_changes_when_error 2019-03-07 15:38:34 -08:00
Gareth J. Greenaway
0fb859d5c8
Adding a test for the rsync state 2019-03-07 15:35:15 -08:00
twangboy
9a8afa6433
Fix tests, add null byte test 2019-03-07 16:28:31 -07:00
Daniel Wozniak
a7a97544d7
Merge pull request #51896 from twangboy/win_disks 
Add all attached drives to the disks grain
 2019-03-07 11:35:00 -07:00
Daniel Wozniak
48d298c568
Merge pull request #51918 from twangboy/fix_compat 
Fix _compat for py3
 2019-03-07 11:33:27 -07:00
Alexander Fischer
fcac9f3e92
Skip Test on Non-Windows systems 2019-03-07 11:33:09 -05:00
Alexander Fischer
f42d17d093
Derive from LoaderModuleMockMixin 2019-03-07 11:31:35 -05:00
Alexander Fischer
5052017ea6
Define __opts__ dict 2019-03-07 11:31:35 -05:00
Alexander Fischer
b7b571e393
Define __opts__ dict 2019-03-07 11:31:35 -05:00
Alexander Fischer
ee3ad08e14
Define __opts__ dict 2019-03-07 11:31:35 -05:00
Alexander Fischer
64d8451dcb
Use default file module 2019-03-07 11:31:34 -05:00
Alexander Fischer
886ef1997e
Fix name of makedirs_ method 2019-03-07 11:31:34 -05:00
Alexander Fischer
4cc5f77b76
Check for path to be a symlink 2019-03-07 11:31:31 -05:00
Megan Wilhite
54ea40a265
Merge branch '2019.2' into merge-2019.2 2019-03-07 10:38:23 -05:00
Shane Lee
057d415d23
Merge branch '2018.3' into win_disks 2019-03-06 12:35:34 -07:00
Gareth J. Greenaway
faa3471c05
Merge branch '2018.3' into 2018.3 2019-03-05 17:42:18 -08:00
twangboy
a791901775
Fix compat, add tests 2019-03-05 18:38:51 -07:00
Gareth J. Greenaway
6c0dcf222c
Swapping pchanges for changes in file state. 2019-03-05 17:01:13 -08:00
Daniel Wozniak
2ebfa22f87
Merge pull request #51967 from twangboy/add_compat_tests 
Add unit tests for _compat.py
 2019-03-05 17:18:34 -07:00
twangboy
0d419e378c
Fix some lint 2019-03-05 17:13:08 -07:00
twangboy
aa61dabab4
Add tests 2019-03-05 17:09:07 -07:00
Ch3LL
a16891347c
Merge branch '2018.3' into '2019.2' 
Conflicts:
  - doc/conf.py
  - salt/modules/win_system.py
  - salt/states/boto3_route53.py
 2019-03-05 16:00:05 -05:00
Daniel Wozniak
c8e2971eaa
Merge pull request #51980 from Ch3LL/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2019-03-05 13:19:19 -07:00
Daniel Wozniak
2c4dff609c
Merge pull request #51905 from aplanas/fix_mount 
mount: fix extra -t parameter
 2019-03-05 12:55:59 -07:00
Daniel Wozniak
4b2c8cceff
Merge pull request #51815 from garethgreenaway/51673_multiple_file_sections_with_excludes 
[2018.3] Fix to inotify beacon when multiple file paths with excludes are used
 2019-03-05 12:49:38 -07:00
Daniel Wozniak
c3105df625
Merge pull request #51855 from garethgreenaway/51825_scheduled_global_enabled 
[2019.2] Global enable/disable was being ignored
 2019-03-05 12:40:33 -07:00
Daniel Wozniak
be28623bf7
Merge pull request #51946 from Ethyling/fix-systemd-version 
Fix retrieve systemd version using regex
 2019-03-05 12:20:18 -07:00
Daniel Wozniak
c310022bf2
Merge pull request #51964 from dwoz/issue_51816 
[2019.2] Make sure ldap attrs are string types on python 2
 2019-03-05 12:18:29 -07:00
Shane Lee
205657804f
Merge branch '2018.3' into add_compat_tests 2019-03-05 12:17:48 -07:00
Ch3LL
9adc19eeb1
Merge branch '2017.7' into '2018.3' 
Conflicts:
 - doc/conf.py
 - salt/modules/zfs.py
 2019-03-05 14:08:35 -05:00
Shane Lee
e85f0043f6
Merge branch '2018.3' into add_compat_tests 2019-03-05 10:29:43 -07:00
twangboy
ea69062fb3
Fix lint 2019-03-05 10:28:59 -07:00
Pedro Algarvio
0b4e68c2ba
Lint fixes 2019-03-05 17:10:57 +00:00
Pedro Algarvio
af4ae913d0
Lint fixes 2019-03-05 17:10:33 +00:00
Pedro Algarvio
ee4df3a43c
Lint fixes 2019-03-05 17:10:07 +00:00
Pedro Algarvio
257b3fc566
Windows needs special treatment 2019-03-05 16:42:03 +00:00
Pedro Algarvio
33955c9ed1
Windows needs special treatment 2019-03-05 16:39:15 +00:00
Pedro Algarvio
56f841f091
Windows needs special treatment 2019-03-05 16:34:07 +00:00
Jordan Jacobelli
b55770768f Add test for systemd version from git describe 
Signed-off-by: Jordan Jacobelli <jordan@cri.epita.fr>
 2019-03-05 12:41:31 +01:00
Alberto Planas
ac688df875 mount: fix extra -t parameter 
If 'fstype' parameter is not set in Linux environments, salt will
build a mount command with an empty -t value, making the command
fail.
 2019-03-05 11:48:09 +01:00
Daniel Wozniak
a879140e21
Merge branch '2019.2' into issue_51816 2019-03-05 03:02:12 -07:00
Daniel Wozniak
6aee2c4502
Merge pull request #51806 from twangboy/fix_beacon 
Fix diskusage beacon on Windows
 2019-03-05 02:23:10 -07:00
twangboy
eb984f5b32
Add unit tests for _compat.py 2019-03-04 18:08:18 -07:00
twangboy
a38300b156
Use winapi.com instead of coinitialize 2019-03-04 17:59:06 -07:00
Daniel A. Wozniak
0e61cf39e4
Fix linter errors/warnings 2019-03-04 14:48:33 -07:00
Daniel A. Wozniak
8c641c66fb
make LDAP attr defaults string types on py2 2019-03-04 14:36:14 -07:00
Gareth J. Greenaway
58ef51db75
Merge branch '2018.3' into 51673_multiple_file_sections_with_excludes 2019-03-01 11:40:07 -08:00
Daniel Wallace
1f3be1cb90
fix import in test 2019-03-01 13:37:42 -06:00
Daniel Wallace
8572c17091
rename kubernetes module to kubernetesmod 
This makes sure this doesn't import the kubernetes module from
salt/modules while the kubernetes python module is not installed
 2019-03-01 13:33:50 -06:00
Erik Johnson
1fcb0ff264
Fix edge case when minion ID is a 16-character string 
Some code in salt._compat which checks if the value is a packed binary
representation of an IPv6 address fails if the value passed is not a
bytestring (i.e. a `unicode` type on PY2 or `str` type on PY3). This
fixes that code when the minion ID is a 16-character string (not a
bytestring). Note that the minion ID will never be a bytestring as of
2018.3.0, so this affects any 16-character minion ID when the minion ID
is checked to see if it is really an IP address.
 2019-03-01 10:52:03 -05:00
Daniel Wozniak
6da495fd29
Fix linter 2019-02-27 11:36:37 -07:00
Gareth J. Greenaway
72466a53bd
Global enable/disable was being ignored 2019-02-26 15:58:42 -08:00
Daniel A. Wozniak
f78b360c0a fix reactor ping test 2019-02-26 15:49:20 -06:00
Gareth J. Greenaway
63da8be7c9
Fixing a bug that caused excludes to not work as expected when multiple file options were in place, the excludes of the last file section were being used over any previous ones. Including a test to ensure excludes work as expected when multiple file sections are in place. 2019-02-25 17:19:39 -08:00
twangboy
2bf6179743
Fix some lint 2019-02-25 13:15:43 -07:00
twangboy
0f38eea9a0
Add lowercase test 2019-02-25 12:52:17 -07:00
twangboy
7cdc660552
Add some tests 2019-02-25 12:41:26 -07:00
Gareth J. Greenaway
61735787dc
Fixing lint errors 2019-02-23 10:01:01 -08:00
Gareth J. Greenaway
e37fc20e7c
Merge branch '2018.3' into merge-2018.3 
Conflicts:
  - doc/ref/modules/all/index.rst
  - salt/states/file.py
  - tests/unit/modules/test_yumpkg.py
  - tests/unit/modules/test_zypperpkg.py
  - tests/unit/states/test_file.py
 2019-02-22 16:38:15 -08:00
twangboy
64f45f8650
Make recurse and directory case sensitive 2019-02-22 11:44:39 -07:00
twangboy
feb29f3353
Make recurse and directory case sensitive 2019-02-21 18:59:09 -07:00
Gareth J. Greenaway
d681064607
Merge branch '2018.3' into nftables_cleanup 2019-02-20 12:03:58 -08:00
Gareth J. Greenaway
e37458ee35
Fixing a couple tests. 2019-02-20 09:52:54 -08:00
Ch3LL
4171271930
Fix pylint, remove unused import 2019-02-20 10:20:24 -05:00
Ch3LL
3f146197a1
Remove skipif and change expected return for solarisips test 2019-02-20 10:14:04 -05:00
Daniel Wallace
61b43905c2
fix modulenames from virtualnames tests 2019-02-20 08:06:29 -06:00
Daniel A. Wozniak
3263d31592
Merge remote-tracking branch 'saltstack/2018.3' into solarisipstests 2019-02-20 01:17:36 -07:00
Daniel Wozniak
8111479346
Merge branch '2018.3' into merge-2018.3.4 2019-02-20 01:13:19 -07:00
Gareth J. Greenaway
dc4afbb8b4
More updates to nftables module, state modules, and unit tests. 2019-02-19 17:42:19 -08:00
Daniel A. Wozniak
9caafeca61
Skip solarisips when not on solaris 2019-02-19 16:59:10 -07:00
Daniel A. Wozniak
043efa08fa
Skip solarisips when not on solaris 2019-02-19 16:58:10 -07:00
Daniel Wallace
d59952fce6
Merge branch '2018.3' into virtualnames 2019-02-19 16:59:42 -06:00
Daniel A. Wozniak
7ed0d7dd51
Fix ruby gems tests, again 2019-02-19 14:22:54 -07:00
Daniel A. Wozniak
fab74bb78d
Fix ruby gems tests, again 2019-02-19 14:11:39 -07:00
Daniel A. Wozniak
0d3b227674
Fix ruby gems tests, again 2019-02-19 14:06:36 -07:00
Daniel A. Wozniak
b5a626590c
Fix ruby gems tests, again 2019-02-19 14:04:45 -07:00
Daniel Wallace
33bb5bfe69
fix use of virtualname 
Make sure that the virtualname is included in the actual filename of
core modules.  This will help speed up loading of modules that need to
use the virtualname, so that we hit @depends decorators less.
 2019-02-19 13:16:06 -06:00
Gareth J. Greenaway
3ec96e36e2
initial work to cleanup the nftables module, state module, and the unit tests. 2019-02-19 10:44:01 -08:00
Megan Wilhite
b46eac3ec0
Merge branch '2019.2' into merge-2019.2 2019-02-19 11:02:29 -05:00
Ch3LL
6292f861f6
Revert "Remove custom grains module from 2018.3 branch" 
This reverts commit 191235d8d3.
 2019-02-19 10:57:44 -05:00
Daniel Wozniak
0bd2d6eadb
Merge pull request #51561 from isbm/isbm-saltssh-thintar-delay-fix 
SaltSSH: fix delay when creating thin TAR
 2019-02-19 03:15:46 -07:00
Ch3LL
64322db582
Fix is_windows utils call 2019-02-15 15:18:24 -05:00
Ch3LL
92bd6b9dc3
Fix salt.utils.is_windows call 2019-02-15 15:16:38 -05:00
Ch3LL
ffa2f5fa50
Merge branch '2018.3' into '2019.2' 
Conflicts:
  - pkg/windows/build_env_2.ps1
  - pkg/windows/build_env_3.ps1
  - pkg/windows/req.txt
  - pkg/windows/req_win.txt
  - salt/grains/core.py
 2019-02-15 15:09:36 -05:00
Daniel Wozniak
18452c4e4d
Merge pull request #51528 from twangboy/backport_51471 
Backport 51471
 2019-02-15 12:36:38 -07:00
Shane Lee
5a98fb9751
Merge branch '2018.3' into lgpo_boolean_element_fix 2019-02-14 13:35:19 -07:00
Gareth J. Greenaway
fbacb35424
Merge branch '2018.3' into 51266_schedule_enable_disable_break_save 2019-02-14 09:00:50 -08:00
Shane Lee
ad294f30a2
Merge branch '2019.2' into increase_wait_2019.2 2019-02-14 09:31:41 -07:00
Shane Lee
9c964efa5a
Merge branch '2018.3' into increase_wait_2018.3 2019-02-14 09:31:14 -07:00
Shane Lee
e2377a975f
Merge branch '2017.7' into increase_wait 2019-02-14 09:30:39 -07:00
Shane Lee
1a882d7fc0
Merge branch '2019.2' into batch_exit_2019.2 2019-02-14 09:29:12 -07:00
Gareth J. Greenaway
3d52b26cbd
Merge branch '2018.3' into 51266_schedule_enable_disable_break_save 2019-02-14 07:20:19 -08:00
Bo Maryniuk
f79c81a9e1 Update UT mocking, adjusting for temporary file 2019-02-14 15:50:21 +01:00
Daniel A. Wozniak
a5af9c5388
Increase minion wait for slow boxes 2019-02-14 02:04:35 -07:00
Daniel A. Wozniak
918030e48d
Increase minion wait for slow boxes 2019-02-14 02:00:28 -07:00
Daniel A. Wozniak
7c2d7a4390
Increase minion wait for slow boxes 2019-02-14 01:46:53 -07:00
Daniel A. Wozniak
4b11d6bb5c
increase batch test timeout on windows 2019-02-14 01:34:01 -07:00
Daniel A. Wozniak
1087d10bea
increase batch test timeout on windows 2019-02-14 01:25:40 -07:00
Daniel A. Wozniak
42d1d02e6d
increase batch test timeout on windows 2019-02-14 01:23:23 -07:00
Daniel Wozniak
dadf414700
Merge pull request #51637 from twangboy/backport_50887_2018.3 
backport #50887
 2019-02-13 20:03:03 -07:00
Gareth J. Greenaway
deeefc728b
Merge branch '2018.3' into 51266_schedule_enable_disable_break_save 2019-02-13 18:38:54 -08:00
twangboy
d8d2b863a5
backport #50887 2019-02-13 17:31:13 -07:00
Shane Lee
1206a94006
Merge branch '2018.3' into fix_51566 2019-02-13 17:00:53 -07:00
twangboy
11681412af
Add test for explicit lists 2019-02-13 16:59:07 -07:00
Shane Lee
ddc017c857
Merge branch '2018.3' into add_tests_51534 2019-02-13 15:33:28 -07:00
twangboy
9e3a01b930
Use existing file instead of tzutil 2019-02-13 15:32:16 -07:00
lomeroe
5ed8eb648e Properly create the value for a "True" boolean element item 
Closes #51634
 2019-02-13 15:24:45 -06:00
twangboy
30c18324a4
Use tempfile to get temp dir 2019-02-13 12:40:19 -07:00
twangboy
e3d3c5a8e2
Add tests for issue 51309 2019-02-13 12:22:36 -07:00
Daniel A. Wozniak
22d31539c4
fix linter 2019-02-13 11:06:42 -07:00
Daniel A. Wozniak
9a4ea8f8ab
Wait for minions to be pingable before starting tests 2019-02-13 11:06:20 -07:00
Gareth J. Greenaway
0760133336
adding integration.scheduler.test_helpers to various files to by pass the test_module_name_source_match check. 2019-02-13 09:27:55 -08:00
Gareth J. Greenaway
1552fba0bc
lint cleanup 2019-02-13 09:27:55 -08:00
Gareth J. Greenaway
086066b75f
Adding a test to ensure _get_schedule which is used by the save functionality works when there is an enabled attribute. 2019-02-13 09:27:55 -08:00
Daniel Wozniak
6b1a2016db
Merge branch '2018.3' into 51069-ri-and-rdoc-removed 2019-02-13 01:57:14 -07:00
Daniel Wozniak
fdb13a3a91
Merge pull request #51523 from lomeroe/solarisips_fixes 
Bugfixes in solarisips
 2019-02-13 01:14:45 -07:00
Daniel Wozniak
4abd9d0462
Merge branch '2019.2' into merge-2018.3 2019-02-13 01:12:52 -07:00
Daniel Wozniak
e3d5fbe947
Merge pull request #51577 from garethgreenaway/merge-2017.7 
[2018.3] Merge forward from 2017.7 to 2018.3
 2019-02-13 01:11:10 -07:00