Daniel Wallace
c76f7eb028
enable debug logging on the minionlog
2018-03-15 14:29:54 -06:00
Nicole Thomas
bd62699ccb
Merge pull request #46563 from gtmanfred/2017.7.5
...
virtualenv version too old for python3.6
2018-03-15 16:17:15 -04:00
Daniel A. Wozniak
3b6901e19d
Honor named tests when running integration suites
2018-03-15 13:16:43 -07:00
Daniel Wallace
8d5ab72983
virtualenv version too old for python3.6
...
This test is testing an old version of virtualenv with pip_env, and the version
of pip is 6.x.x, which is too old and doesn't work with the importlib in python
3.6. Skipping this test if python is newer then 3.5.
2018-03-15 12:18:23 -06:00
Nicole Thomas
0a68c22332
Merge pull request #46541 from gtmanfred/metadata
...
handle user-data for metadata grains
2018-03-15 13:21:30 -04:00
Daniel Wallace
2916708124
Merge pull request #46561 from gtmanfred/2017.7.5
...
disable verbose
2018-03-15 10:36:40 -06:00
Daniel Wallace
2c39ac6dfb
disable verbose
2018-03-15 10:35:35 -06:00
Nicole Thomas
048b2ba3f6
Merge pull request #46547 from garethgreenaway/46427_service_module_cumulus
...
[2017.7] Disable service module for Cumulus
2018-03-15 12:14:59 -04:00
Nicole Thomas
98e3260b9a
Merge pull request #46548 from Ch3LL/profit_test
...
profitbrick test: check for foo,bar username,password set in profitbrick config
2018-03-15 10:25:27 -04:00
Nicole Thomas
79f2a76609
Merge pull request #46549 from Ch3LL/dimension_test
...
Fix dimensionsdata test random_name call
2018-03-15 10:23:40 -04:00
Erik Johnson
703b5e7e65
Change versionadded to show that 2018.3.0 will not have this function
2018-03-15 00:01:42 -05:00
Erik Johnson
010d260d06
Rewrite failing Suse pkg integration test
...
This makes the test less brittle by hard-coding which package to use
2018-03-14 23:35:25 -05:00
Erik Johnson
f3f5dec239
zypper.py: fix version argument being ignored
2018-03-14 23:34:36 -05:00
Erik Johnson
214f2d6ad3
Add pkg.list_repo_pkgs to zypper.py
2018-03-14 23:33:51 -05:00
psyer
a91926561f
Fix linting problems
...
Fix spaces and comma spacing.
2018-03-14 15:53:00 -04:00
Ch3LL
bb338c464c
Fix dimensionsdata test random_name call
2018-03-14 15:28:06 -04:00
Ch3LL
db96c4e72e
check for foo,bar username,password set in profitbrick config
2018-03-14 14:57:48 -04:00
Gareth J. Greenaway
edd0b11447
Merge branch '2017.7' into 46427_service_module_cumulus
2018-03-14 11:51:52 -07:00
Gareth J. Greenaway
ea3c16080e
Disable the service module on Cumulus since it is using systemd.
2018-03-14 11:24:43 -07:00
psyer
e8d3d017f9
fix bytes or str in find command
...
The subprocess command with communicate and encode() sometimes comes back
either a string or bytes. No sure why but to fix this just check output
and change all str to bytes.
2018-03-14 13:03:47 -04:00
Erik Johnson
b70c3389da
Fix case where no comments specified
2018-03-14 11:22:15 -05:00
Daniel Wallace
ee3bff6e32
Merge pull request #46537 from rallytime/bp-46529
...
Back-port #46529 to 2017.7.5
2018-03-14 08:47:27 -06:00
Daniel Wallace
19bd1d9db5
handle user-data for metadata grains
2018-03-14 08:40:09 -06:00
GLOBAL\i039818
267ae9f633
Fix missing saltenv and pillarenv in pillar.item
...
Fixes #36153
2018-03-14 14:58:45 +01:00
Daniel Wallace
289c7a228f
retry if there is a segfault
2018-03-14 07:52:18 -04:00
Erik Johnson
ce391c53f4
Add regression test for #44299
2018-03-13 21:30:14 -05:00
Erik Johnson
c3e36a6c94
Fix regression in yumpkg._parse_repo_file()
...
Changing this function to use a configparser removed its ability to
track comments, causing a loss of idempotence when comments are being
managed. This fixes that regression by adding a check for each repo's
comments during the same pass we use to read in the header comments.
2018-03-13 21:30:06 -05:00
Erik Johnson
f0c79e3da3
Slight modification to salt.utils.pkg.rpm.combine_comments()
...
This ensures that there is a space after the "#" for readability, and
also makes sure that there is a trailing newline at the end of the
comments.
2018-03-13 21:18:56 -05:00
psyer
0877cfc38f
Merge branch '2017.7' into fix-cmd-run-env-corrupt
2018-03-13 20:38:00 -04:00
Daniel Wallace
083846fe0e
Merge pull request #46529 from gtmanfred/kitchen
...
retry if there is a segfault
2018-03-13 16:41:53 -06:00
Daniel Wallace
50d6e2c7be
retry if there is a segfault
2018-03-13 16:40:35 -06:00
Daniel Wallace
caefedc095
make sure utils is empty for pickling for windows
2018-03-13 15:36:51 -06:00
Frode Gundersen
1ad4d7d988
fix assert errors
2018-03-13 21:01:46 +00:00
Frode Gundersen
e6a56016df
update test
2018-03-13 20:54:25 +00:00
Nicole Thomas
1271536a89
Merge pull request #46519 from rallytime/man-pages-2017.7.5
...
Update man pages for 2017.7.5
2018-03-13 16:00:50 -04:00
psyer
86176d1252
Merge branch '2017.7' into fix-cmd-run-env-corrupt
2018-03-13 15:44:45 -04:00
psyer
3a7cc44ade
Add python3 support for byte encoded markers
...
Python3 unit test complained about find() and byte encoding not working,
so since py2 allows byte ops we will do searches that way and hopefully
make py 2 and 3 happy.
2018-03-13 15:35:11 -04:00
psyer
09048139c7
Do not show whole env in error
...
Change var names so we only show parts of stderr and stout and not the whole env.
2018-03-13 13:46:55 -04:00
Nicole Thomas
5cc11129f1
Merge pull request #46511 from rallytime/bp-45769
...
Back-port #45769 to 2017.7
2018-03-13 13:08:51 -04:00
Daniel Wallace
2883548e6b
pass utils to the scheduler for reloading in modules
2018-03-13 11:05:49 -06:00
rallytime
782a5584f5
Update man pages for 2017.7.5
2018-03-13 12:47:40 -04:00
Stefan Reimer
a8ffceda53
Surpress boto WARNING during decode, reference: https://github.com/boto/boto/issues/2965
2018-03-13 10:36:43 -04:00
psyer
ed94700255
fix missing raise statement
...
A raise statement got dropped during copying. Putting it back in.
2018-03-12 23:19:00 -04:00
psyer
15868bc88c
Fixes stdout user environment corruption
...
When using PAM module pam_lastlog.so with config option "showfailed", it
outputs a "Last login ..." line to stdout everytime a shell is spawned.
This corrupts a random env var and causes havoc in paths and the like.
To reproduce: PAM option was put in /etc/pam.d/su file with line:
session required pam_lastlog.so showfailed
then: salt <minion> cmd.run runas=<user> env
Which will show "Last login ..." in one of the env vars.
This fix will set a marker before the users env is created. Make the env var.
Then set a marker after it is done. Then will grab the real env info between
the markers, and throw away the markers. Any stdout noise is then mitigated.
2018-03-12 21:19:44 -04:00
Nicole Thomas
0e90c8ca6f
Merge pull request #46493 from terminalmage/issue46207
...
salt-call: don't re-use initial pillar if CLI overrides passed
2018-03-12 16:41:51 -04:00
Nicole Thomas
b11a8fc8e0
Merge pull request #46450 from gtmanfred/salt_runner
...
load grains for salt.cmd runner
2018-03-12 14:52:22 -04:00
Nicole Thomas
22d753364b
Merge pull request #46337 from gtmanfred/2017.7
...
Fix using names with listen and listen_in
2018-03-12 14:49:59 -04:00
Nicole Thomas
b7191b8782
Merge pull request #46413 from meaksh/2017.7-explore-result-in-depth
...
Explore 'module.run' state module output in depth to catch "result" properly
2018-03-12 14:49:06 -04:00
Daniel Wallace
02a79a2014
Merge pull request #46496 from gtmanfred/kitchen
...
more test kitchen clean up
2018-03-12 12:28:33 -06:00
Daniel Wallace
da002f78d0
include virtualenv path for py3 windows
2018-03-12 12:24:51 -06:00
