valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
85,697 Commits 24 Branches 182 Tags 341 MiB
15ffecd4a7
Commit Graph

85697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
twangboy
1379627334 Fix unit.cloud.clouds.test_ec2 for Windows 
Mock instead of create tempfile
 2017-09-08 15:36:52 -06:00
Daniel Wallace
58378866e5 make cache dirs when spm starts 2017-09-08 14:16:09 -06:00
MattLLVW
f6313a1b2c Merge branch '2017.7' into fix-env-order 2017-09-08 19:00:50 +02:00
Nathan Fish
54dd4d3ef7 nfs_exports: linting and versionadded 2017-09-08 11:59:27 -05:00
Nicole Thomas
9b27473763 Merge pull request #43371 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-09-08 11:39:11 -04:00
matt
e93a962980 Fix env_order in state.py 
Fixes #42165
 2017-09-08 17:10:07 +02:00
Nicole Thomas
97f05ff603 Merge pull request #43398 from twangboy/win_fix_test_mount 
Fix `unit.modules.test_mount` for Windows
 2017-09-08 09:39:28 -04:00
Nicole Thomas
6a4cc5c1b0 Merge pull request #43399 from twangboy/win_fix_test_pam 
Fix `unit.modules.test_pam` for Windows
 2017-09-08 09:37:49 -04:00
Nicole Thomas
2b5cfae3f8 Merge pull request #43400 from twangboy/win_unit_test_parted 
Fix `unit.modules.test_parted` for Windows
 2017-09-08 09:36:59 -04:00
Nicole Thomas
332deeb013 Merge pull request #43401 from twangboy/win_unit_test_pw_group 
Fix `unit.modules.test_pw_group` for Windows
 2017-09-08 09:35:44 -04:00
Nicole Thomas
c0f54bfef1 Merge pull request #43402 from twangboy/win_unit_test_qemu_nbd 
Fix `unit.modules.test_qemu_nbd` for Windows
 2017-09-08 09:34:57 -04:00
Nicole Thomas
be88fbb45f Merge pull request #43404 from twangboy/win_unit_test_seed 
Fix `unit.modules.test_seed` for Windows
 2017-09-08 09:32:40 -04:00
Nicole Thomas
612c6a8756 Merge pull request #43301 from twangboy/win_fix_unit_test_spm 
Fix `unit.test_spm` for Windows
 2017-09-08 09:24:34 -04:00
Alessandro -oggei- Ogier
8d79ee2d49 test system group creation 2017-09-08 10:34:14 +02:00
twangboy
6ceb895a84 Use os.path.join for paths 2017-09-07 16:51:10 -06:00
twangboy
531ce8022b Fix unit.modules.test_qemu_nbd for Windows 
Use os.sep
 2017-09-07 15:44:35 -06:00
twangboy
78e39a1b9d Fix unit.modules.test_pw_group for Windows 
Skip `test_info` and `test_getent` because they require grp which is not
available on Windows
 2017-09-07 15:34:57 -06:00
twangboy
8e3e897ee2 Fix unit.modules.test_parted for Windows 
Mock salt.utils.is_windows to be False so that the __virtual__ tests
will run
 2017-09-07 15:27:11 -06:00
twangboy
6257aa964a Fix unit.modules.test_pam for Windows 
Mocks os.path.exists
 2017-09-07 15:18:14 -06:00
twangboy
4a8d7e522c Fix tests, Use full path to salt.utils.which 2017-09-07 14:41:56 -06:00
Heghedus Razvan
6721afa330 nilrt_ip: Fix DNS 
Configuring DNS in connman is done by using Nameservers section not
Domain section

Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
 2017-09-07 22:29:40 +03:00
spenceation
2d6e8e7a7c Added high availability execution module for PANOS proxies. 
Fixes XPATH formatting on set commands.
Fixes PANOS proxy ping function.
 2017-09-07 15:11:58 -04:00
Sergey Kizunov
9adb3f9c72 Updates due to feedback 
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-09-07 13:41:11 -05:00
Sergey Kizunov
88ee8ad566 Add config option id_function 
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-09-07 13:41:10 -05:00
Sergey Kizunov
09d81317fb Changes from feedback 
- Add comment as to why we import inside the function
- Have one log.debug that prints out the appropriate function string

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-09-07 13:41:09 -05:00
Sergey Kizunov
1e4691af8a Add ability to set minion ID by module 
Fixes #15389. Add a new configuration option `minion_id_type`. Solution
based on configuration option `master_type`.
`eval_minion_id_func` based on `salt.minion.eval_master_func`.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>

Conflicts:
	salt/config/__init__.py
 2017-09-07 13:41:09 -05:00
Sergey Kizunov
3c58717c58 Add config option to ensure jid is unique 
Having a jid that is occasionally not unique (eg two processes creating
jobs at about the same time) causes problems in my usage due to
job tracking assuming unique jids. Add a config option called `unique_jid`
that will enforce unique jids, but will change the jid format by
appending an underscore and the process id.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-09-07 13:25:35 -05:00
Nicole Thomas
3c454d4156 Merge pull request #43125 from pabloh007/docker-present-pass-kwargs 
Added feature to pass kwargs to the build process for docker_image.pr…
 2017-09-07 13:46:56 -04:00
Nicole Thomas
f959113694 Merge pull request #43372 from skizunov/develop5 
Fix system.set_system_time when no hw clock is present
 2017-09-07 13:45:32 -04:00
Nicole Thomas
e9a5fd4f93 Merge pull request #43195 from moio/expand-list_pkg-attr-parameter 
list_pkg attr parameter: add support for epoch, release
 2017-09-07 13:36:22 -04:00
Nicole Thomas
6d13535ed0 Merge pull request #43193 from jettero/template-dne-again 
Prevent spurious "Template does not exist" error
 2017-09-06 16:16:57 -04:00
Nicole Thomas
cde8aed2cf Merge branch '2017.7' into template-dne-again 2017-09-06 14:04:58 -04:00
Alexandru Bleotu
103ef69016 Merge branch 'develop' into ext_pillar_config_param-gh 2017-09-06 18:49:37 +01:00
Sergey Kizunov
281e471853 Fix system.set_system_time when no hw clock is present 
If a hardware clock is not present, then the `cmd.run_all` call in
`has_settable_hwclock` will return a non-zero retcode. If
`ignore_retcode` is not set to True in that call, then it will set
`__context__['retcode']` to that code which will cause the job to
appear as if it failed (due to non-zero retcode) even though it
didn't really fail.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-09-06 11:45:02 -05:00
Alexandru Bleotu
33feda7a5b Mocked salt.utils.args.get_function_argspec instead of inspect.getargspec in all external pillar data tests 2017-09-06 12:26:40 -04:00
Alexandru Bleotu
ec9f29cb56 Changed inspect.getargspec to salt.utils.args.get_function_argspec 2017-09-06 12:26:38 -04:00
Nicole Thomas
7d462d29c2 Merge branch 'develop' into expand-list_pkg-attr-parameter 2017-09-06 12:15:01 -04:00
Nathan Fish
0ce48eecd7 states/nfs_export: add __virtual__() 2017-09-06 11:03:02 -05:00
Nathan Fish
889a556e85 modules/nfs3: linting 2017-09-06 10:40:37 -05:00
Gareth J. Greenaway
0acf0ffd69 Swapping list() for []. 2017-09-06 07:17:16 -07:00
Gareth J. Greenaway
3104bde2e4 Replacing double quotes with single quotes. 2017-09-06 07:09:49 -07:00
Gareth J. Greenaway
4cd38d7cd5 Updating per requests. 2017-09-06 07:09:49 -07:00
Gareth J. Greenaway
b9b5181046 Fixing lint, too many spaces. 2017-09-06 07:09:49 -07:00
Gareth J. Greenaway
ace483f57a Fixing various lint issues 2017-09-06 07:09:49 -07:00
Gareth J. Greenaway
c228cb490c Allow editing previous messages and having them resubmitted to the Slack engine. Fixing passing kwargs. Fixing passing pillar values. 2017-09-06 07:09:49 -07:00
Gareth J. Greenaway
43d8c65bf4 Swapping slack engine over to using a class for easier passing around for bits. General cleanup and fixing of messages when things go wrong. 2017-09-06 07:09:49 -07:00
rallytime
7b07b58396 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/key.py
  - salt/modules/yumpkg.py
 2017-09-06 09:44:34 -04:00
rallytime
5701d54516 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/state.py
  - salt/utils/gitfs.py
 2017-09-06 09:39:27 -04:00
Andreas Thienemann
6aefa5c3f8 Update unit test to provide osmajorrelease grain. 2017-09-06 03:46:00 +02:00
Mike Place
1ddf818b41 Merge pull request #42336 from cloudflare/textfsm-mod 
New execution module: textfsm
 2017-09-05 17:28:30 -06:00