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
70,482 Commits 24 Branches 182 Tags 341 MiB
ef4e437bbc
Commit Graph

70482 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
ef4e437bbc Fix the win_ip_test failures (#39230) 
The changes made in #38793 changes the "get_all_ointerfaces" call
to be a list of DNS servers. This change adjusts the tests structure
from a string to a list and fixes the test failure.
 2017-02-07 14:53:59 -07:00
Mike Place
df5f934c34 Merge pull request #39199 from rallytime/bp-39170 
Back-port #39170 to 2016.3
 2017-02-07 09:19:31 -07:00
Mike Place
2621c119fd Merge pull request #39206 from cachedout/issue_issue_37174 
Ignore empty dicts in highstate outputter
 2017-02-07 09:11:35 -07:00
Mike Place
dd440452ea Merge pull request #39209 from terminalmage/sorted-envs 
Sort the return list from the fileserver.envs runner
 2017-02-07 09:07:08 -07:00
Erik Johnson
e6dda4a625 Sort the return list from the fileserver.envs runner 2017-02-06 21:30:13 -06:00
Mike Place
be31e0559c
Ignore empty dicts in highstate outputter 
Closes #37174
 2017-02-06 16:25:48 -07:00
Nicole Thomas
7bed68743e [2016.3] Pylint fix (#39202) 2017-02-06 14:42:30 -07:00
Raine Curtis
c129905310 Added missing source_hash_name argument in get_managed function 
Additional fix to  #33187
Customer was still seeing errors, this should now work.
Tested with 2015.8.13 and 2016.11.2
 2017-02-06 12:40:55 -07:00
Mike Place
ab76054127 Merge pull request #39197 from cachedout/pr-38793 
Pr 38793
 2017-02-06 12:23:12 -07:00
Mike Place
f3d35fb5c6
Lint fixes 2017-02-06 12:20:08 -07:00
Mike Place
fa45cbc359 Merge pull request #39166 from Ch3LL/fix_boto_ec2_docs 
fix boto ec2 module create_image doc
 2017-02-06 11:27:16 -07:00
Mike Place
a40cb46249 Merge pull request #39173 from rallytime/restore-community-docs 
Restore "Salt Community" doc section
 2017-02-06 11:19:10 -07:00
rallytime
5aeddf42a0 Restore "Salt Community" doc section 
This was moved to the `topics/index.rst` page in PR #10792, but
seems to have been accidentally removed in PR #30770.
 2017-02-03 16:43:04 -07:00
Ch3LL
90af696331 fix boto ec2 module create_image doc 2017-02-03 10:23:12 -07:00
Erik Johnson
9de08af950 Apply fix from #38705 to 2016.3 branch (#39077) 
* Apply fix from #38705 to 2016.3 branch

This is a better fix and covers more use cases than the sudo_user one.

* Remove saltenv param from internal state func call

This was probably redundant in the first place, but since state.sls,
state.highstate, etc. accept a saltenv param and the actual state
functions do not, this results in multiple values passed for the saltenv
param.

Remove this argument and let file.get_managed reference __env__
internally.

* Update archive tests to match 2016.11 branch
 2017-02-03 09:35:49 -07:00
Daniel Wallace
da3053ea9b update vmware getting started doc (#39146) 
The IDE entry needs to be a dictionary entry.  Without this, it is seen
as a string.  This is probably done this way so that in the future,
configurations can be added to the IDE device.
 2017-02-03 09:00:00 -07:00
garethgreenaway
e78ca0f575 Fixing a weird edge case when using salt syndics and targetting via pillar. Without this fix the master of masters ends up in an infinite loop since the data returned from the minions is differently structured than if a sync was not in use. (#39145) 2017-02-02 16:05:26 -07:00
C. R. Oldham
cd8077ab81 Merge pull request #38804 from alexbleotu/root_dir_fix-2016.3-gh 
Second attempt to fix prepending of root_dir to paths
 2017-02-02 09:10:36 -07:00
Ivan Babrou
6ffeda3ee5 Clarify ipv6 option for minion and inteface for master, closes #39118 (#39131) 
* Clarify ipv6 option for minion and inteface for master, closes #39118

* Add ipv6 reference
 2017-02-02 08:35:00 -07:00
Alexandru Bleotu
b3bdd3b04a Add missing whiteline 2017-02-02 10:23:22 +00:00
Alexandru Bleotu
c7715acd53 Merge pull request #3 from cro/ab_rootdirfix 
When running testsuite, salt.syspaths.ROOT_DIR is often empty.
 2017-02-02 10:02:18 +00:00
C. R. Oldham
e8cbafaaf1 When running testsuite, salt.syspaths.ROOT_DIR is often empty. 2017-02-01 15:57:38 -07:00
Erik Johnson
646b9ea4e5 Don't abort pillar.get with merge=True if default is None (#39116) 
* Don't abort pillar.get with merge=True if default is None

This prevents a SaltInvocationError from being raised if the default is
loaded from a import_yaml jinja macro and the file being loaded is empty
(which is an entirely valid use case). In these cases, the loaded
default would be None, which we don't want to cause an exception.

* Add test case for issue 39062
 2017-02-01 15:07:31 -07:00
Mike Place
cc9b69b6bc Merge pull request #39091 from terminalmage/update-test-valid-docs 
Run test_valid_docs in batches
 2017-02-01 12:09:04 -07:00
Alexandru Bleotu
b12dd44a26 Merge pull request #1 from cro/ab_rootdirfix 
Remove extra if statements (rstrip will check for the presence anyway).
 2017-02-01 17:12:41 +00:00
C. R. Oldham
bffc537aca Remove extra if statements (rstrip will check for the presence anyway). 2017-02-01 09:40:45 -07:00
Erik Johnson
d76f0380d0 add debug logging for batch vars 2017-02-01 00:05:21 -06:00
Erik Johnson
b4afea2a25 Don't fail test if data is empty 
This keeps trimmed output from failing the test. We are still testing
with a specific module lower down in the test, so this doesn't reduce
our test coverage.
 2017-02-01 00:05:21 -06:00
Erik Johnson
b3a5d549c1 Account for trimmed value in 'salt -d' output 2017-02-01 00:05:21 -06:00
Erik Johnson
909916c78e Run test_valid_docs in batches 
This test fails often due to being trimmed, thanks to
salt.utils.dicttrim trimming values > max_event_size.

This commit changes this test so that it runs sys.doc twice, ensuring
that the return from sys.doc (for now) is not trimmed.
 2017-02-01 00:05:05 -06:00
Erik Johnson
bcee3d1ef6 Move fileclient tests to tests/integration/fileserver/fileclient_test.py (#39081) 
Being in the root of tests/integration/, these were not being run in
jenkins and would only run if executed manually using the -n flag in
runtests.py.
 2017-01-31 13:44:50 -07:00
Nicole Thomas
122422bc08 Bump openstack deprecation notice to Oxygen (#39067) 
I spoke with @gtmanfred and this isn't ready to be removed just yet,
so we're bumping the removal to Oxygen.
 2017-01-31 10:21:13 -07:00
Nicole Thomas
a24af5ac46 Merge pull request #39047 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2017-01-30 16:48:13 -07:00
rallytime
b732a1f646 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2017-01-30 16:45:16 -07:00
Nicole Thomas
56ccae6ff7 Add 2015.8.14 release notes file (#39046) 2017-01-30 16:44:00 -07:00
Nicole Thomas
fef1b1133d Add 2016.3.6 release notes file (#39045) 2017-01-30 16:43:50 -07:00
Nicole Thomas
7c43f4ac32 [2016.3] Update release numbers for doc build (#39042) 2017-01-30 15:52:33 -07:00
Nicole Thomas
ff324599d5 Update 2016.3.5 release notes (#39038) 2017-01-30 15:39:47 -07:00
Nicole Thomas
5943fe65d3 Update 2015.8.13 release notes (#39037) 2017-01-30 15:39:33 -07:00
Mike Place
5b09dc4198 Merge pull request #39028 from terminalmage/clarify-delimiter-argument 
Clarify delimiter argument
 2017-01-30 11:20:25 -07:00
Nicole Thomas
1ff359fa58 Add CLI Example for rest_sample_utils.get_test_string function (#39030) 
Fixes test_valid_doc test that is failing on 2016.11
 2017-01-30 10:34:25 -07:00
C. R. Oldham
f13fb9ef1e Enable __proxy__ availability in states, highstate, and utils. Enable __utils__ availability in proxies. (#38899) 2017-01-30 10:32:23 -07:00
Erik Johnson
f29ef071f3 Clarify delimiter argument 
This makes the usage of the delimiter argument in pillar.get/grains.get
more clear.
 2017-01-30 10:15:48 -06:00
Mike Place
da96221741 Merge pull request #38951 from DSRCorporation/bugs/37938_fix_depends_decorator_memleak 
Keep the only one record per module-function in depends decorator.
 2017-01-27 10:05:42 -07:00
Mike Place
85165edb70 Merge pull request #38982 from rallytime/fix-34780 
Set response when using "GET" method in s3 utils
 2017-01-27 10:04:47 -07:00
Mike Place
cfdbc99e12 Merge pull request #38989 from alprs/docfix-state_pt3_environ 
Documentation: fix SLS in environment variable examples
 2017-01-27 10:00:07 -07:00
Mike Place
55e4d2572e Merge pull request #39000 from rallytime/skip-badload-test 
Skip the test_badload test until Jenkins move is complete
 2017-01-27 09:58:20 -07:00
Mike Place
fe054eb772 Merge pull request #38995 from terminalmage/fix-pillar.item-docstring 
Fix pillar.item docstring
 2017-01-27 09:57:59 -07:00
rallytime
4b3ff0fe0f Skip the test_badload test until Jenkins move is complete 
Once this happens, we need to re-enable the test. The move over
should also allow us to upgrade the version of salt-testing that
is applied to the test VMs. Once this is complete, we can apply
the `@flaky` decorator to this test. (salt-testing must be a
version newer than the September release.)
 2017-01-27 09:51:30 -07:00
Erik Johnson
06d094dd8f Fix pillar.item docstring 
The documentation was incorrectly suggesting that this function supports
pillar override data on the CLI.

Also, this commit changes the default target delimiter from a hard-coded
value to salt.defaults.DEFAULT_TARGET_DELIM. This change is functionally
neutral but will help to future-proof this code in the unlikely event
that we ever change the default target delimiter.
 2017-01-27 09:00:07 -06:00