Commit Graph

70288 Commits

Author SHA1 Message Date
Mike Place
d674369efc Fix ip/port issue with salt-call (#37766)
Closes #37725
2016-11-21 09:41:27 -07:00
Denys Havrysh
518a3dd7ee Add unit tests for Salt parsers processing logging options 2016-11-21 16:53:29 +02:00
Z. Liu
acf0f960ef check count of columns after split
If called on a device w/o extfs, a unhandled exception will be raise.
After add this check, is implies that attributes will be empty if the
device's filesystem is not extfs.
2016-11-21 14:45:24 +08:00
Denys Havrysh
83d6a44254 Add ssh_log_file option to master config and documentation 2016-11-20 16:13:55 +02:00
Denys Havrysh
c8a0915460 Fix configuration example and documentation for syndic_log_file option 2016-11-19 13:11:36 +02:00
Aaron Miller
262e3b3697 respect trailing dot in ddns name parameter
Fixes #37287
2016-11-18 22:25:24 -08:00
twangboy
9696b6dfa5 Use keyword args instead of relying on ordering 2016-11-18 10:26:44 -07:00
Benjamin Drung
819c9658ed Support initializing OpenSSL 1.1
salt-call fails to run with OpenSSL 1.1:

Traceback (most recent call last):
  File "/usr/bin/salt-call", line 11, in <module>
    salt_call()
  File "/usr/lib/python2.7/dist-packages/salt/scripts.py", line 346, in salt_call
    import salt.cli.call
  File "/usr/lib/python2.7/dist-packages/salt/cli/call.py", line 6, in <module>
    from salt.utils import parsers
  File "/usr/lib/python2.7/dist-packages/salt/utils/parsers.py", line 28, in <module>
    import salt.config as config
  File "/usr/lib/python2.7/dist-packages/salt/config/__init__.py", line 41, in <module>
    import salt.utils.sdb
  File "/usr/lib/python2.7/dist-packages/salt/utils/sdb.py", line 9, in <module>
    import salt.loader
  File "/usr/lib/python2.7/dist-packages/salt/loader.py", line 30, in <module>
    import salt.utils.event
  File "/usr/lib/python2.7/dist-packages/salt/utils/event.py", line 72, in <module>
    import salt.payload
  File "/usr/lib/python2.7/dist-packages/salt/payload.py", line 17, in <module>
    import salt.crypt
  File "/usr/lib/python2.7/dist-packages/salt/crypt.py", line 42, in <module>
    import salt.utils.rsax931
  File "/usr/lib/python2.7/dist-packages/salt/utils/rsax931.py", line 69, in <module>
    libcrypto = _init_libcrypto()
  File "/usr/lib/python2.7/dist-packages/salt/utils/rsax931.py", line 63, in _init_libcrypto
    libcrypto.OPENSSL_no_config()
  File "/usr/lib/python2.7/ctypes/__init__.py", line 375, in __getattr__
    func = self.__getitem__(name)
  File "/usr/lib/python2.7/ctypes/__init__.py", line 380, in __getitem__
    func = self._FuncPtr((name_or_ordinal, self))
AttributeError: /lib/x86_64-linux-gnu/libcrypto.so.1.1: undefined symbol: OPENSSL_no_config

OpenSSL 1.1 replaced the symbols OPENSSL_no_config and
OPENSSL_add_all_algorithms_noconf by OPENSSL_init_crypto and added these
definitions:

    OPENSSL_init_crypto(OPENSSL_INIT_NO_LOAD_CONFIG, NULL)
    OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
                        | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)

These definitions can only be used when compiling the source code, but
not when loading the symbols dynamically. Thus salt needs to adapt the
initialization for OpenSSL 1.1. Try to use OPENSSL_init_crypto (which
was introduced in OpenSSL 1.1) and fall back to the previous behavior
for OpenSSL 1.0 and older (when OPENSSL_init_crypto is not found).

You can easily reproduce the issue on Debian unstable by running

    apt install salt-master
    salt-call

Bug-Debian: https://bugs.debian.org/844503
2016-11-18 16:15:38 +01:00
Mike Place
c62ff6b023 Add thorium path to syspaths (#37767)
cc: @thatch45

Refs #33709
2016-11-18 07:40:57 -07:00
Denys Havrysh
e64dd3ed6b Correct default attributes for various parser classes 2016-11-18 12:22:54 +02:00
Mike Place
bff949f4e9 Merge pull request #37760 from hu-dabao/fix_cb_returner
Fix couchbase returner and add couple of more features
2016-11-18 00:28:23 +00:00
twangboy
398eaa074d Add pre_versions to the available arguments 2016-11-17 17:08:55 -07:00
Mike Place
1f976ac212 Merge pull request #37738 from terminalmage/issue36629
Allow pillar.get to retrieve fresh pillar data when saltenv passed
2016-11-17 23:13:04 +00:00
C. R. Oldham
7aee7fc63c Switch default filter tag for ONE resources from user only to all resources (#37745)
* Switch default filter tag for ONE resources from user only to all resources.  Add get_one_version to return version of ONE.

* Pylint fix
2016-11-17 15:59:12 -07:00
Hengyang Hu
de372f277e 1. returner no need to check whether the jid exists for external job cache setup
2. add full_ret to return doc so that the document will be informative
3. make ttl as a config attribute because salt-minion does not have keep_jobs attribute
4. add password into config attribute
5. update the documents accordingly
2016-11-17 13:53:55 -08:00
Erik Johnson
da46678c51 Allow pillar.get to retrieve fresh pillar data when saltenv passed 2016-11-17 13:53:29 -06:00
Julien Cigar
6ba8d4e97f check for SERVICE_DIR in __virtual__ in salt.modules.daemontools (#37748)
* set __virtualname__ to 'service'

* add SERVICE_DIR check in __virtual__
2016-11-17 10:20:43 -07:00
Denys Havrysh
82a2e216b3 Fix default usage string for Salt command line programs 2016-11-17 09:43:09 +02:00
David J. Haines
516a67e6a3 fix indexing error
both the existing code and my addition erroneously strip the first result from the semodule call
2016-11-16 16:16:41 -05:00
Mike Place
fa7883115e Merge pull request #37735 from Ch3LL/fix_joyent_profile
change size and image of joyent profile
2016-11-16 21:07:51 +00:00
David J. Haines
4e49c1e991 fix typo
missed a pair of parens
2016-11-16 15:20:44 -05:00
David Haines
b16f2d8400 handle semodule version >=2.4 (#37732) and fix typo 2016-11-16 14:47:05 -05:00
Ch3LL
9ef41dcdfc change size and image of joyent profile 2016-11-16 11:54:21 -07:00
Nicole Thomas
98e25c68aa Merge pull request #37731 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-11-16 10:13:02 -07:00
Mike Place
3be9ab4cd0 Warn on AES test for systems with > 1 core (#37724)
* Warn on AES test for systems with > 1 core

* Whitespace fix
2016-11-16 09:44:33 -07:00
rallytime
ec1389711f Merge branch '2015.8' into '2016.3'
No conflicts.
2016-11-16 09:31:17 -07:00
Thomas S Hatch
35655d521f Merge pull request #37721 from terminalmage/zd909
Fix for pillar setting 'environment' key in __gen_opts()
2016-11-16 09:04:53 -07:00
Denys Havrysh
45dffa292f Fix readding and updating logfile and pidfile config options for Salt API 2016-11-16 10:49:49 +02:00
Mike Place
f417dbbe99 Merge pull request #37718 from terminalmage/docs
Fix incorrectly-formatted RST
2016-11-16 08:21:08 +00:00
Mike Place
99cda7c003 Merge pull request #37719 from terminalmage/docs-2016.3
Fix incorrectly-formatted RST (2016.3 branch)
2016-11-16 08:20:53 +00:00
Erik Johnson
acdd5513da Update git_pillar docs to reflect info from bugfix 2016-11-16 01:41:20 -06:00
Erik Johnson
433737d2dc Fix for pillar setting 'environment' key in __gen_opts()
7a6e402 added ``environment`` as a key in the master opts. This had the
unfortunate side effect of breaking the dynamic pillar feature in
git_pillar, which relies on pillar setting this opts key to the value
from the minion opts.
2016-11-16 01:10:54 -06:00
Erik Johnson
f163b4c724 Fix incorrectly-formatted RST 2016-11-15 22:16:09 -06:00
Erik Johnson
23b8b2a3f4 Fix incorrectly-formatted RST 2016-11-15 22:09:32 -06:00
Mike Place
8dea695c7c Merge pull request #37694 from cachedout/npm_git
Catch differences in git URLs in npm state
2016-11-16 01:56:18 +00:00
Mike Place
329448ccd7 Merge pull request #37705 from rallytime/fix-37665
Don't overwrite the "key" variable passed in to _listeners_present func
2016-11-16 10:26:37 +13:00
Mike Place
ac9a316b50 Merge pull request #37707 from Ch3LL/fix_timeout_azure
add timeout increase on azure tests
2016-11-16 10:24:24 +13:00
Ch3LL
363122c675 add timeout increase on azure tests 2016-11-15 10:27:44 -07:00
C. R. Oldham
1ece265354 Merge pull request #37704 from twangboy/fix_test_disabled_2016.3
Fix test disabled 2016.3 [DO NOT MERGE FORWARD]
2016-11-15 09:48:52 -07:00
rallytime
3b7e9c5e3b Don't overwrite the "key" variable passed in to _listeners_present func
Fixes #37665
2016-11-15 09:47:32 -07:00
twangboy
a0429cf839 Use nfsd instead of apsd for test_disabled 2016-11-15 09:44:42 -07:00
Denys Havrysh
f47253c21b Fix reading and applying Salt Cloud default configuration 2016-11-15 14:25:31 +02:00
Mike Place
44f05acbff Merge pull request #37690 from twangboy/update_pyzmq_2016.3
Update pyzmq to 15.3.0 for 2016.3 [DO NOT MERGE FORWARD]
2016-11-15 16:10:36 +13:00
Mike Place
a743d8b5e6 Merge pull request #37680 from rallytime/bp-32965
Back-port #32965 to 2016.3
2016-11-15 15:56:46 +13:00
Mike Place
0e3bc2366a
Catch differences in git URLs in npm state
There is a case where a salt user might specify git://foo/bar
but the npm package might believe it lives at git://foo/bar.git

This attempts to normalize and account for that difference.
2016-11-15 15:34:25 +13:00
twangboy
cf55342150 Update pyzmq to version 15.3.0 2016-11-14 17:11:20 -07:00
Mike Place
1c2d6ff293 Merge pull request #37681 from rallytime/bp-35965
Back-port #35965 to 2016.3
2016-11-15 10:19:22 +13:00
Nathan Grennan
700f3fa57f Set the return code to 1 on salt-ssh highstate errors 2016-11-14 12:30:33 -07:00
kevin
1865b13645 Fix 'present' option when used without 'key_type' 2016-11-14 12:16:51 -07:00
Denys Havrysh
fad5bec936 Work with a copy of default opts dictionaries 2016-11-14 18:14:03 +02:00