valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
81,190 Commits 24 Branches 182 Tags 341 MiB
f3694e08da
Commit Graph

81190 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mircea Ulinic
c249551393 net.load_config arg: text instead of config 
RTFM: https://docs.saltstack.com/en/develop/ref/modules/all/salt.modules.napalm_network.html#salt.modules.napalm_network.load_config
 2017-05-04 14:07:01 +01:00
Mircea Ulinic
35335dd8e9 More opts and fixes 2017-05-04 12:50:49 +00:00
Debian
3f6fea2e1a Fix netyang modules and examples 2017-05-04 12:41:34 +00:00
peter-funktionIT
80fa9e5b76 Update win_pki.py 
Add warning about passwords.
 2017-05-04 11:23:48 +02:00
Nicole Thomas
0e0a73fd91 Merge pull request #41052 from terminalmage/gate-git_opts 
Gate the new git_opts argument in git execution module
 2017-05-03 17:10:06 -06:00
Nicole Thomas
2bf02fad81 Merge pull request #41050 from terminalmage/git_pillar-tests 
Fix git_pillar integration tests on Arch
 2017-05-03 16:53:31 -06:00
Nicole Thomas
ec214760df Merge pull request #41055 from saltstack/revert-40899-remove-md5-warning 
Revert "Updated ssh fingerprint hash-type default to sah256 for Nitrogen and remove md5 warnings"
 2017-05-03 16:49:55 -06:00
Nicole Thomas
c13f0dc2a8 Revert "Updated ssh fingerprint hash-type default to sah256 for Nitrogen and remove md5 warnings" 2017-05-03 16:49:39 -06:00
Nicole Thomas
2b47b7bec6 Merge pull request #41045 from terminalmage/clarify-gitfs-docs 
Clarify gitfs docs
 2017-05-03 16:24:54 -06:00
Erik Johnson
ee493bae47 Update package targets for Arch pkg tests 
Something else is installing pytz (likely via pip), causing filesystem
conflicts when the pkg integration tests try to install python2-pytz as
a dep of python2-django.

This commit also changes a bunch of the other tests so that they are
explicitly skipped instead of just being no-ops in cases where they are
not configured to be run. This provides more accurate information in the
overall test results.
 2017-05-03 17:02:32 -05:00
Erik Johnson
f77393b80d Skip git_pillar integration tests on cent6 
Cent6 has too old of a version of git to handle the make_repo func that
spawns the git repos used in these tests.
 2017-05-03 16:36:36 -05:00
Erik Johnson
bd5e0bdbe3 Gate the new git_opts argument in git execution module 
The -c argument for git was added in version 1.7.2, but RHEL6 has 1.7.1.
This commit performs a version check if git_opts are passed, and raises
an exception if the git version is < 1.7.2.
 2017-05-03 16:31:58 -05:00
twangboy
2af38e5564 Use target instead of version_num 2017-05-03 14:20:40 -06:00
Erik Johnson
a94d081004 Add check for git-http-backend 
This allows for more graceful test failures when the libexec dir is
different from what the test class determines it should be.
 2017-05-03 15:16:16 -05:00
Erik Johnson
33515f6a14 Fix git_pillar integration tests on Arch 
The location of the git-http-backend is within /usr/lib instead of
/usr/libexec.

This also uncomments a line that was commented out for troubleshooting
purposes.
 2017-05-03 14:49:14 -05:00
Ch3LL
ba223827b9
fix integration wheel test_gen test 2017-05-03 15:37:44 -04:00
William Kilian
b65b82a750 mac_system: return False for non-root user 
Fixes #40835.

Previously an exception was raised and salt repeatedly tried to load
the module. This spammed the console with error messages.
 2017-05-03 14:36:10 -05:00
Nicole Thomas
819007cd00 Merge pull request #41032 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-05-03 13:31:58 -06:00
Nicole Thomas
31c8b60ebf Merge pull request #41040 from gtmanfred/vaultdoc 
link vault pillar docs to vault module docs
 2017-05-03 13:31:34 -06:00
Erik Johnson
c757eda331 Clarify gitfs docs 
This improves cross links to the per-remote docs from the master config
file documentation.
 2017-05-03 13:34:56 -05:00
Mike Place
d7fbd38474 Merge pull request #41007 from jleproust/fix_lvm_empty_vg 
Recognize LVM2 pv with empty vg as orphan
 2017-05-03 12:24:50 -06:00
Mike Place
43af2669f6 Merge pull request #41010 from twangboy/fix_test_standard 
Fix test_full_returns integration test on Windows
 2017-05-03 12:18:25 -06:00
Mike Place
31a109172e Merge pull request #41037 from gtmanfred/tops 
add extmod whitelist and blacklist to tops
 2017-05-03 11:52:01 -06:00
Mike Place
a1f83ebb1e Merge pull request #41033 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-03 11:13:42 -06:00
Daniel Wallace
1183b8b557 link vault pillar docs to vault module docs 2017-05-03 11:11:00 -06:00
Nicole Thomas
4eab962e9e Merge pull request #41029 from rallytime/bp-38565 
Back-port #38565 to 2016.11
 2017-05-03 11:05:09 -06:00
Erik Johnson
effe8b9432 Look for currently-running python's pip first 
This improves pip detection on hosts where "pip" exists and refers to a
different Python version from the Python under which Salt is running. It
does so by getting the major and minor version from sys.version_info and
looking for pipX.Y before checking the rest of the potential names for
pip.
 2017-05-03 12:04:35 -05:00
Mike Place
3626258f50 Merge pull request #40899 from rallytime/remove-md5-warning 
Updated ssh fingerprint hash-type default to sah256 for Nitrogen and remove md5 warnings
 2017-05-03 10:55:26 -06:00
Daniel Wallace
6d17e36ad2 add extmod whitelist and blacklist to tops 2017-05-03 10:20:26 -06:00
Erik Johnson
72ef34c420 Do not force effective saltenv when running states via orchestration 
The saltenv argument from state orchestration was being ignored in favor
of the magic __env__ dunder. This affects highstates run via
orchestration, which by default should process all envs in the loaded
tops.
 2017-05-03 11:14:36 -05:00
rallytime
19a3ecd5b8 Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-05-03 09:59:09 -06:00
rallytime
d26fd0bbf4 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-05-03 09:57:23 -06:00
Drew Malone
2df93ae3ab Update management of ip addresses. 
- Assign static, private IP addresses.
- Ability to not assign a public IP to a VM.
 2017-05-03 09:36:03 -06:00
rallytime
bed524a731 Update test hash to be sha256 instead of md5 2017-05-02 16:20:06 -06:00
Nicole Thomas
4a45dbdbac Merge pull request #41013 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-02 16:09:40 -06:00
Nicole Thomas
97500f078d Merge pull request #41012 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-05-02 16:06:39 -06:00
Nicole Thomas
b00acb0034 Merge pull request #41011 from terminalmage/docker-refresh-credentials 
Use proposed docker-py reload_config() function
 2017-05-02 16:06:21 -06:00
twangboy
c7d164423e Increase timeout of run_function 2017-05-02 16:01:06 -06:00
Erik Johnson
b8d1dcc307 Use proposed docker-py reload_config() func 
See https://github.com/docker/docker-py/pull/1586

This allows an existing client instance to disregard its cached auth
config and use the most up-to-date login info from the config.json.
 2017-05-02 15:03:19 -05:00
Julien Leproust
3b9a845145 Recognize LVM2 pv with empty vg as orphan 2017-05-02 21:59:56 +02:00
Daniel Wallace
7b94f78339 Define seperate target for proxy minions 
Proxy minions require a lot more to reload than regular minions do.  Provide a
seperate _target for proxy minions so that the `__proxy__` dictionary gets
reloaded by windows proxy minions.
 2017-05-02 13:24:55 -06:00
rallytime
a80f7256e9 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/engines/docker_events.py
  - salt/utils/winservice.py
 2017-05-02 12:55:04 -06:00
rallytime
fc756c595c Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/config/__init__.py
 2017-05-02 12:52:59 -06:00
twangboy
3ef4734d0e Increase timeout for Windows 2017-05-02 11:37:01 -06:00
Mike Place
19894f68ca Merge pull request #40724 from cro/minion_key_revoke_cfg 
Minion key revoke cfg
 2017-05-02 11:18:05 -06:00
Mike Place
e210eaead4 Merge pull request #40726 from benediktwerner/fix-minions-remain-pending-after-autosign-and-typo 
Fixed minion keys remaining pending after auto signing and fixed typo (Resubmitted to 2016.3)
 2017-05-02 10:57:33 -06:00
Mike Place
044e0b2063 Merge pull request #40860 from twangboy/change_broadcast 
Remove dependency on win32gui
 2017-05-02 10:45:51 -06:00
Mike Place
4f342e2fe5 Merge pull request #40960 from danlsgiga/2016.11 
Fix consul module "AttributeError: 'dict' object has no attribute 'json'"
 2017-05-02 10:16:56 -06:00
Mike Place
c3b329b398 Merge pull request #40963 from twangboy/fix_win_useradd 
Fix fullname parameter for add function
 2017-05-02 10:08:58 -06:00
Mike Place
64eae1ab84 Merge pull request #40972 from ezh/fabric-fix-2-ssh_py_shim 
[#40971] Fix TypeError: must be str, not bytes for ssh_py_shim
 2017-05-02 10:06:24 -06:00