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
68,979 Commits 24 Branches 182 Tags 341 MiB
83425274f5
Commit Graph

68979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
83425274f5 Update release notes for 2016.3.3 (#35602) 2016-08-19 10:27:34 -06:00
Mike Place
9683bb3c58 Merge pull request #35580 from twangboy/fix_35102 
Fix mac_service attempts to parse non-plist files
 2016-08-19 18:24:37 +09:00
Mike Place
c4ec94d6e8 Merge pull request #35586 from hu-dabao/fix-35420 
Fix 35420,  add run_on_start in build_schedule_item
 2016-08-19 18:23:32 +09:00
Hengyang Hu
2d3a882cc2 fix 35420, add run_on_start in build_schedule_item, remove redundancy of enabled 2016-08-18 23:11:55 -07:00
Erik Johnson
4f0b3be20c Fix localemod tests (#35583) 
This changes the mocking for the context variables to reflect changes
made in 5b12f03.
 2016-08-18 20:56:20 -06:00
twangboy
4122e66ed5 Handle malformed plist files 2016-08-18 17:07:16 -06:00
Nicole Thomas
d1339fd9f5 Merge pull request #35579 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-18 16:00:41 -06:00
twangboy
52feff9309 Fix mac_service attempts to parse non-plist files 2016-08-18 14:58:20 -06:00
rallytime
00dff9dcbd Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-18 14:44:12 -06:00
Erik Johnson
26a7f7d9f7 Merge pull request #35577 from terminalmage/unit-file-changes 
Unit file changes for 2015.8.12, 2016.3.3
 2016-08-18 15:36:25 -05:00
Nicole Thomas
f7a18234db Merge pull request #35571 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-18 13:50:03 -06:00
Nicole Thomas
9943224f10 adding the () to make changes work (#35573) 
without this change it won't ever show any changes
 2016-08-18 13:49:27 -06:00
Erik Johnson
6cb0fb47f3 pkg/salt-syndic.service: change Type to notify 2016-08-18 14:45:46 -05:00
Erik Johnson
175ba99e0e pkg/salt-minion.service: remove KillMode, change Type to notify 2016-08-18 14:44:51 -05:00
Erik Johnson
540ec28954 pkg/salt-master.service: remove KillMode 2016-08-18 14:44:19 -05:00
Erik Johnson
69fad464ab pkg/salt-api.service: change Type to notify 2016-08-18 14:43:50 -05:00
rallytime
2930df924e Update localemod_test systemd.sd_booted mock to use salt.utils.systemd.booted 
This brings these tests inline with the changes made to salt.utils.systemd.booted
in #35510
 2016-08-18 13:31:26 -06:00
Erik Johnson
73b549ed00 Merge pull request #35572 from terminalmage/docs 
Fix poor formatting in pkg state docs
 2016-08-18 13:15:52 -05:00
Erik Johnson
7d7a7de9e6 Fix poor formatting in pkg state docs 2016-08-18 13:14:11 -05:00
rallytime
e61b04a707 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/clouds/digital_ocean.py
  - salt/cloud/clouds/ec2.py
  - salt/cloud/clouds/libcloud_aws.py
  - salt/cloud/clouds/opennebula.py
  - salt/cloud/clouds/rackspace.py
  - salt/cloud/clouds/softlayer.py
  - salt/cloud/clouds/softlayer_hw.py
  - salt/cloud/clouds/vmware.py
  - salt/loader.py
  - salt/modules/aptpkg.py
  - salt/modules/ebuild.py
  - salt/modules/pacman.py
  - salt/modules/systemd.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/scripts.py
  - salt/utils/cloud.py
 2016-08-18 12:09:51 -06:00
Nicole Thomas
2a5d1a0eee fix-35384, fix the logic caused by wrong indent (#35566) 2016-08-18 11:03:24 -06:00
Hengyang Hu
e4e331544e fix-35384, fix the logic caused by wrong indent (#35545) 2016-08-18 10:15:15 -06:00
Erik Johnson
feb852f8c0 Clarify config.get docstring (#35492) 
* Clarify config.get docstring

This commit adds clarification that Salt's built-in config options
cannot be overriden by config.get.

* Remind user that pillar_opts must be turned on to traverse master opts

* s/by/be/
 2016-08-18 09:33:49 -06:00
Mike Place
205d8e2e7b Merge pull request #35483 from gtmanfred/2015.8 
use __utils__ in salt.cloud
 2016-08-18 22:32:22 +09:00
Mike Place
70fa2d0901 Merge pull request #35546 from whiteinge/salt-api-eauth-fail-gracefully 
Salt api eauth fail gracefully
 2016-08-18 16:21:55 +09:00
Mike Place
f2eb3dc105 Merge pull request #35489 from rallytime/bp-35463 
Back-port #35463 to 2016.3
 2016-08-18 16:16:03 +09:00
Seth House
eb3574adae Don't fail hard if the user's permissions cannot be found 
Salt enforces authorization not salt-api. Showing the user his/her
permissions is a nicety only. We should make a best effort to retrieve
them but if we cannot we should log the user in instead of blocking.
 2016-08-17 18:56:03 -06:00
Seth House
ec597bd54c Change groups check in token to look for truthy values 
The 'groups' value in the token payload can be missing, can be False,
can be None, or can be an array.
 2016-08-17 18:38:09 -06:00
David Boucha
61fec6caa9 add missing glob import (#35525) 
* add missing glob import

* move glob import so pylint doesn't freak out.

* pylint requires 2 spaces before the comment.

* remove trailing whitespace
 2016-08-17 16:10:00 -06:00
Thomas S Hatch
5cbd5eb10f since some distros strip xml out of python we should treat it as (#35538) 
an optional dep
 2016-08-17 16:07:01 -06:00
Nicole Thomas
0e3f2fc6cb Whitespace fix for 2015.8 (#35540) 2016-08-17 15:33:17 -06:00
Thomas S Hatch
e2bd575461 Merge pull request #35526 from thatch45/ssh_W_tmp 
Always deploy the thin to /var/tmp
 2016-08-17 13:44:26 -06:00
Thomas S Hatch
fd3274c800 Merge pull request #35510 from terminalmage/issue33516 
Better systemd integration
 2016-08-17 12:54:11 -06:00
Nicole Thomas
8b770869e4 Merge pull request #35522 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-17 12:07:16 -06:00
Thomas S Hatch
a381f02cfe Always deploy the thin to /var/tmp 2016-08-17 11:29:46 -06:00
rallytime
ff212d8976 Whitespace fix 2016-08-17 11:18:49 -06:00
Erik Johnson
5b5f19d269 Update zypper unit test to reflect call to config.get 2016-08-17 11:43:22 -05:00
Erik Johnson
2730edb516 Add note about systemd-run usage in package states 2016-08-17 11:43:22 -05:00
Erik Johnson
e2d9e87e10 salt/modules/systemd.py: Use systemd-run --scope where needed 2016-08-17 11:43:22 -05:00
Erik Johnson
22919a25bc Notify systemd on salt-api start 2016-08-17 11:43:22 -05:00
Erik Johnson
a40b3f8a08 Notify systemd on syndic start 2016-08-17 11:43:22 -05:00
Erik Johnson
e847d3af30 Notify systemd on minion start 2016-08-17 11:43:22 -05:00
Erik Johnson
d648887afc salt/modules/zypper.py: Use systemd-run --scope where needed 2016-08-17 11:43:21 -05:00
Erik Johnson
2e17976722 salt/modules/yumpkg.py: Use systemd-run --scope where needed 2016-08-17 11:43:21 -05:00
Erik Johnson
86b59c1e74 salt/modules/pacman.py: Use systemd-run --scope where needed 2016-08-17 11:43:21 -05:00
Erik Johnson
e32d92c6d5 salt/modules/ebuild.py: Use systemd-run --scope where needed 2016-08-17 11:43:20 -05:00
Erik Johnson
c7d21d3ae3 salt/modules/aptpkg.py: Use systemd-run --scope where needed 2016-08-17 11:43:20 -05:00
rallytime
bbf7ce121b Remove final self.MINION_CONNECT_TIMEOUT ref 2016-08-17 10:41:22 -06:00
rallytime
c305d8d99b Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/conf.py
  - tests/runtests.py
 2016-08-17 10:37:57 -06:00
Erik Johnson
f83e0ef242 Add unit tests for salt.utils.systemd 2016-08-17 11:30:14 -05:00