Commit Graph

90668 Commits

Author SHA1 Message Date
Bo Maryniuk
f00cf88c7b Fix unit test for socket data 2018-02-26 15:04:49 +01:00
Bo Maryniuk
cf96edbb3c Fix socket datagram information on Python3 2018-02-26 15:04:37 +01:00
Nicole Thomas
b527a6cec7
Merge pull request #46165 from rallytime/man-pages-rc1
Add man pages for oxygen release
2018-02-24 06:56:06 -05:00
Nicole Thomas
0537e83c4c
Merge pull request #46173 from gtmanfred/mac_autologin
fix unicode for mac autologin test
2018-02-24 06:18:00 -05:00
Daniel Wallace
667b5b9f0c
fix unicode for mac autologin test 2018-02-23 17:00:56 -07:00
rallytime
a731047e59
Add man pages for oxygen release 2018-02-23 12:15:13 -05:00
Nicole Thomas
e6374bf68d
Merge pull request #46149 from rallytime/bp-46145
Back-port #46145 to oxygen.rc1
2018-02-22 16:57:51 -05:00
Nicole Thomas
8cd5d44390
Merge pull request #46147 from dincamihai/oxygen.rc1-salt-ssh-fix
Fix salt-ssh state.apply "'NoneType' object has no attribute 'count'" and unicode issue
2018-02-22 16:49:57 -05:00
rallytime
29468f3dce
Lint fixes 2018-02-22 14:18:28 -05:00
Erik Johnson
22b68ac3da
pillarenv argument should default to None and not the value from opts 2018-02-22 11:20:55 -05:00
Erik Johnson
8d24b20ab3
Better solution for fixing the opts munging in pillar.show_pillar runner
The pillarenv argument to the `Pillar` class is only used as an override
of what is in the opts. Therefore, it should default to None unless
passed in the kwargs.

This also removes the need for a deepcopy of the opts, since we're no
longer making changes to the opts before passing them to the `Pillar`
constructor.
2018-02-22 10:51:54 -05:00
Erik Johnson
2b887dd77d
Update tests to reflect changes to the SaltCacheLoader 2018-02-22 10:51:36 -05:00
Erik Johnson
6a8b1ac33a
Document behavior when orchestration runnner invoked with non-orch states
This also replaces some += usage with list.extend for a modest
performance/memory improvement.
2018-02-22 10:49:39 -05:00
Erik Johnson
a8cded1c83
Instantiate the SaltCacheLoader's fileclient in the __init__
This fixes an edge case when orchestration attempts to compile pillar
data before making any other fileclient requests.
2018-02-22 10:47:15 -05:00
Erik Johnson
d2e26c38ca
salt.runners.pillar.show_pillar: don't modify master opts
This keeps us from modifying the master opts when compiling pillar data
in this runner.
2018-02-22 10:47:15 -05:00
Erik Johnson
7c2cb27108
Properly detect use of the state.orch alias and add orch jid to kwargs
Before, only when `salt-run state.orchestrate` was used would we add the
orch jid to the kwargs.
2018-02-22 10:46:46 -05:00
Mihai Dinca
5af8c5c745 Fix salt-ssh state.apply "'NoneType' object has no attribute 'count'"
and unicode issue

Co-authored-by: Jochen Breuer <jbreuer@suse.de>
2018-02-22 16:29:21 +01:00
Nicole Thomas
6b5b56d302
Merge pull request #46146 from terminalmage/update-version-2018.3.0
Update refrences to Oxygen codename to 2018.3.0
2018-02-22 09:26:01 -05:00
Nicole Thomas
391f45b5cd
Merge pull request #46005 from gtmanfred/ssh
pass opts to SSHClient for enable_ssh_minions
2018-02-22 09:10:44 -05:00
Nicole Thomas
d78d213ac0
Merge pull request #46143 from garethgreenaway/fixing_failing_scheduler_tests
[oxygen.rc1] fix failing schedule tests
2018-02-22 09:10:11 -05:00
Erik Johnson
c77341b544
Rename release notes file to 2018.3.0.rst, add 2018.3.* to release tree 2018-02-21 21:56:54 -06:00
Erik Johnson
1668a489c4
Update refrences to Oxygen codename to 2018.3.0 2018-02-21 21:47:41 -06:00
Nicole Thomas
2934d55c0b
Merge pull request #46141 from rallytime/bp-46123
Back-port #46123 to oxygen.rc1
2018-02-21 17:28:53 -05:00
Nicole Thomas
102958335d
Merge pull request #46140 from rallytime/bp-45911
Back-port #45911 to oxygen.rc1
2018-02-21 17:28:18 -05:00
Gareth J. Greenaway
0d4647c2dd
Removing unnecessary log. 2018-02-21 13:14:05 -08:00
Gareth J. Greenaway
2df1866cc1
Adding a internal reset function to scheduler. Calling reset between schedule tests to ensure schedule is empty and it is using defaults. 2018-02-21 13:00:19 -08:00
Daniel Wallace
713374b7ab
If no pubkey is passed in openmode fail
If the pub entry in the load is empty, we should fail authentication in open
mode.  This is usually caught elsewhere for the other modes, because we would
just write it to a file, but in this case, we only write it to a file if it
actually exists, and if it is different from disk_key, so we would catch all
other options when trying to load the public key.

Fixes #46085
2018-02-21 14:09:17 -05:00
twangboy
3f4c340e3c
Update log statement 2018-02-21 14:04:49 -05:00
twangboy
7cd81a5cb5
Change the Invalid Data Message 2018-02-21 14:04:49 -05:00
twangboy
86c075e6e9
Convert reg values to unicode for debug 2018-02-21 14:04:48 -05:00
Daniel Wallace
53d969a152
mark orch test as flaky 2018-02-21 09:41:57 -07:00
Nicole Thomas
a79d4f12a7
Merge pull request #46119 from rallytime/bp-46094
Back-port #46094 to oxygen.rc1
2018-02-21 10:18:58 -05:00
Nicole Thomas
1f31031adc
Merge pull request #46116 from rallytime/utils-paths
Update stringutils path in reg state to use new location
2018-02-21 10:05:43 -05:00
Nicole Thomas
0e63decaac
Merge pull request #46117 from Ch3LL/mac_ssh_schema
Add stringutils.to_str in test_roster_config_validate test
2018-02-21 09:57:44 -05:00
Nicole Thomas
a50bb41849
Merge pull request #46110 from isbm/isbm-iscsii-master-nonroot
IQN check for iSCSII crash on non-root Master
2018-02-21 09:56:53 -05:00
Nicole Thomas
178eaab503
Merge pull request #46105 from DSRCorporation/bugs/M2Crypto_py3_unicode_fix
M2Crypto Py3 unicode fix
2018-02-21 09:30:33 -05:00
Bo Maryniuk
1b75f98a91 Catch proper exception type 2018-02-21 13:11:44 +01:00
Bo Maryniuk
5149cdbbd9 Fix unit test for py3 2018-02-21 10:53:20 +01:00
Daniel Wallace
9ce14b2a12
pass opts to SSHClient for enable_ssh_minions
Also, use ckminions to get the minions from the roster, instead of doing it in
publish.
2018-02-20 16:06:00 -07:00
Nicole Thomas
772636f67a
Merge pull request #46084 from garethgreenaway/oxygen_swap_to_datetime_objects
[oxygen] swap scheduler to use datetime objects
2018-02-20 17:51:26 -05:00
Nicole Thomas
8f245ea62e
Merge pull request #46069 from rallytime/bp-46036
Back-port #46036 to oxygen.rc1
2018-02-20 17:50:17 -05:00
gwiyeong
fa4270c53e
Fixes memory leak, saltclients should be cleaned after used. 2018-02-20 17:01:20 -05:00
gwiyeong
f063cdcae1
Adds set_close_callback function to removes stream instance after closed from a set streams. 2018-02-20 17:01:20 -05:00
Nicole Thomas
4b8cb89d27
Merge pull request #46114 from Ch3LL/mac_sysctl
Ensure new line is added to file in mac sysctl.present
2018-02-20 16:30:19 -05:00
Nicole Thomas
551f7a6280
Merge pull request #46057 from terminalmage/unicode-normalization
Add unicode normalization support to data/stringutils helpers
2018-02-20 16:26:09 -05:00
Ch3LL
1fd0295cca
Add stringutils.to_str in test_roster_config_validate test 2018-02-20 16:22:15 -05:00
rallytime
d499251137
Update stringutils path in reg state to use new location 2018-02-20 16:16:23 -05:00
Nicole Thomas
0dc8d17540
Merge pull request #46104 from isbm/isbm-x509fixonfix
x509 fix update
2018-02-20 16:08:23 -05:00
Nicole Thomas
7088438930
Merge pull request #46002 from isbm/isbm-zeromq17-deprecationwarning
Pyzmq 17.0.0 proper handling
2018-02-20 16:07:06 -05:00
Nicole Thomas
652e59eb77
Merge pull request #45998 from terminalmage/issue45954
Retry loading serialized job details
2018-02-20 15:58:44 -05:00