valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
94,876 Commits 24 Branches 182 Tags 341 MiB
895d8cee5c
Commit Graph

94876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ch3LL
3a691b405f
add user_home path for both windows and linux 2018-05-30 14:22:10 -04:00
Nicole Thomas
21550dbd2d
Merge pull request #47900 from rallytime/merge-2018.3.1-to-2018.3 
[2018.3] Merge forward from 2018.3.1 to 2018.3
 2018-05-30 14:09:40 -04:00
rallytime
e5d386e91c
Update solaris core grains test 
The check for zpool grains was moved out of core grains and into
zfs grains. The mock for the call to zpool grains function was failing.

We also need to update any calls to the salt.utils file to use the new
paths.
 2018-05-30 13:50:22 -04:00
Nicole Thomas
a0bf565741
Merge pull request #47843 from garethgreenaway/30367_orch_return_false_when_function_fails 
[2018.3] orchestration results False when function is False
 2018-05-30 13:21:53 -04:00
Erik Johnson
25afc932f7
WIP salt-jenkins issue 1000 
This adds logging of the output and retcode when the output file fails
to be created. As I have thus far been unable to reproduce this locally,
this is the best shot at seeing what is causing the issue, since
ShellCase's run_script is rather opaque about what happens in the script
itself. We do know from the salt-runtests.log that the `salt-call -g` is
successfully returning, what we don't know is what happened after that
data was returned, and this should provide that insight.
 2018-05-30 11:40:51 -05:00
rallytime
2801eecb26
Merge branch '2018.3.1' into '2018.3' 
No conflicts.
 2018-05-30 11:14:40 -04:00
Nicole Thomas
ea7b4fdc08
Merge pull request #47897 from Ch3LL/rn_2018 
Add changelog to 2018.3.1 release notes
 2018-05-30 11:04:41 -04:00
Ch3LL
e27ee273a7
Add == line to changelog line for release notes 2018-05-30 10:51:12 -04:00
Ch3LL
61e56d275d
Add changelog to 2018.3.1 release notes 2018-05-30 10:49:30 -04:00
Nicole Thomas
336ec6e274
Merge pull request #47894 from daks/patch-1 
Updating minion configuration doc
 2018-05-30 10:30:47 -04:00
Nicole Thomas
82857a7b42
Merge pull request #47871 from bochi/zypperfix 
Fixing "installed:" in pkg.info
 2018-05-30 10:14:21 -04:00
Nicole Thomas
225824f1d8
Merge branch 'develop' into patch/43914 2018-05-30 10:13:28 -04:00
Nicole Thomas
b9da4f1221
Merge pull request #47876 from doesitblend/add-file-read-windows 
Add file read windows
 2018-05-30 10:03:54 -04:00
Nicole Thomas
09242697b8
Merge branch '2018.3' into 30367_orch_return_false_when_function_fails 2018-05-30 09:56:14 -04:00
Éric Veiras Galisson
405c90aa76
Updating minion configuration doc 
Correcting default value for log_level_logfile like written in default /etc/salt/minion. See #47893
 2018-05-30 15:52:54 +02:00
Nicole Thomas
cbe2ecfae8
Merge pull request #47882 from frogunder/45013 
add whoami test
 2018-05-30 09:47:12 -04:00
Nicole Thomas
f4288a8616
Merge pull request #47869 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-05-30 09:44:15 -04:00
Nicole Thomas
f15e636d5e
Merge pull request #47848 from twangboy/fix_47784 
Fix some major issues with the LGPO module
 2018-05-30 09:37:32 -04:00
Nicole Thomas
9bfac036c1
Merge pull request #47878 from rallytime/develop-lint 
Whitespace fix
 2018-05-29 18:23:03 -04:00
Frode Gundersen
38d114a2d2
add whoami test 2018-05-29 21:51:02 +00:00
Ken Jordan
3f7e7ec327
Add file.read function to Windows module 2018-05-29 15:28:21 -06:00
Daniel Wallace
92b8c4c08e
Merge pull request #47881 from gtmanfred/2018.3.1 
quote python_version in requirements.txt
 2018-05-29 16:12:04 -05:00
Daniel Wallace
3d874b5529
quote python_version in requirements.txt 2018-05-29 16:08:58 -05:00
Daniel A. Wozniak
3884c2cf5f
Fix ami role usage warts #47269 
Removing 3 un-needed encode calls. Requests Response.text is unicode,
now that this file uses unicode_literals Response.text can by used
without having to encode it.
 2018-05-29 13:52:25 -07:00
rallytime
1ad8f6711b
Whitespace fix 2018-05-29 16:33:14 -04:00
Todd Wells
d700e18a06
move new parameter to end of def 2018-05-29 13:29:25 -07:00
Nicole Thomas
da6f7a5538
Merge pull request #47866 from rallytime/bp-47814 
Back-port #47814 to 2018.3
 2018-05-29 15:55:24 -04:00
Nicole Thomas
d9e7f2b5b1
Merge pull request #47865 from rallytime/bp-47600 
Back-port #47600 to 2018.3
 2018-05-29 15:54:43 -04:00
Nicole Thomas
705bf8172d
Merge pull request #47874 from gtmanfred/2018.3.1 
Tornado 5.0 is only supported on python 2 for now
 2018-05-29 15:45:43 -04:00
David Murphy
d2baabff61 Updated for reviewer comments to utilise list comprehensions 2018-05-29 13:34:36 -06:00
David Murphy
de126d6c9f Updates for further review comments 2018-05-29 13:34:36 -06:00
David Murphy
77993a41d0 Updated for review comments 2018-05-29 13:34:36 -06:00
David Murphy
d1cf515386 pylint clean up 2018-05-29 13:34:36 -06:00
David Murphy
798c5fdf54 Added AIX grains support for machine_id 2018-05-29 13:34:36 -06:00
David Murphy
e8fe2e4595 Added AIX grains better support for cpu and OS information 2018-05-29 13:34:36 -06:00
David Murphy
3b5c412944 Added AIX grains support for productname, manufacturer, serialnumber and firmware 2018-05-29 13:34:36 -06:00
Daniel A. Wozniak
ebc7cde9cb
Revert job chunk wait time change 
Reverting the sleep time from 0.0001 back to 0.01, sleeping such a short
amount of time eats up CPU resources needlessly.
 2018-05-29 12:34:35 -07:00
twangboy
98facf8dc8
Remove log.debug statement in __virtual__ 2018-05-29 13:21:12 -06:00
Jenni
0738a0f6c2
fix merge conflict 2018-05-29 12:12:11 -07:00
Jenni
2395951d36
Merge remote-tracking branch 'upstream/develop' into develop 2018-05-29 12:09:30 -07:00
Jenni
f3a3ce582b
move release note to fluorine 2018-05-29 12:05:01 -07:00
Daniel Wallace
13f920415a
add tornado5 note to 2018.3.1 2018-05-29 14:01:54 -05:00
Daniel Wallace
aeacd2b749
allow tornado 5.0 to be installed only for python2 2018-05-29 14:01:18 -05:00
Stefan Bogner
4e521a973e fixing lint violation 2018-05-29 20:25:42 +02:00
plastikos
80bb6e4711
Merge branch 'develop' into issue-13889 2018-05-29 12:10:42 -06:00
rallytime
267f09c1a0
Lint: Remove unused import 2018-05-29 13:56:15 -04:00
Daniel Wallace
cf1e5d4c25
Merge pull request #47742 from nickgarber/develop__wip-issue-40975-read-salt-cloud-maps-from-the-pillar 
[WIP] feat: read Salt-Cloud Maps from the Pillar
 2018-05-29 12:37:48 -05:00
Stefan Bogner
8b1a465156 Fixing "installed:" in pkg.info 
In some cases, ie. for packages that have been installed as dependency, zypper info's output will be "Installed      : Yes (automatically)" which will result in "Installed: False" when using pkg.info

Random example:

sles12sp3-7:~ # zypper info xev
Loading repository data...
Reading installed packages...

Information for package xev:
----------------------------
Repository     : @System
Name           : xev
Version        : 1.2.1-2.15
Arch           : x86_64
Vendor         : SUSE LLC <https://www.suse.com/>
Support Level  : unknown
Installed Size : 49.9 KiB
Installed      : Yes (automatically)

suma31:~ # salt sles12sp3-7 pkg.info xev
sles12sp3-7:
    ----------
    xev:
        ----------
        arch:
            x86_64
        installed:
            False
 2018-05-29 18:23:04 +02:00
rallytime
d9096653f7
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/cloud/__init__.py
  - tests/integration/cloud/providers/test_ec2.py
  - tests/support/paths.py
 2018-05-29 11:28:06 -04:00
rallytime
120ee16b70
Replace old utils paths with new utils paths 2018-05-29 11:19:34 -04:00