valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
67,877 Commits 24 Branches 182 Tags 341 MiB
7c909a1d7f
Commit Graph

67877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolodja Wentland
57e0475cd4 Make pip InstallationError import more robust 
The way the version check was implemented fails on ancient pip versions
that do not provide pip.__version__ yet.

We will therefore simply try to import InstallationError and fall back
to ValueError if it has not been defined in the installed pip version.
 2016-05-20 12:30:57 +02:00
Byron Clark
291a3e21fa Remove duplicated code. 
This check exists twice in the code. Once is good enough for anyone.
 2016-05-20 12:30:32 +02:00
Erik Johnson
946d27e82a Fix traceback in logging for config validation (#33386) 2016-05-19 17:46:46 -07:00
rallytime
5aec32b20f Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-05-19 18:18:10 -06:00
Thomas S Hatch
d15f5e2cef Merge pull request #33383 from thatch45/2015.5 
maintain the fallabck because I am totally sick of this crap
 2016-05-19 18:03:59 -06:00
Thomas S Hatch
f5ebcba21c restore whitespace 2016-05-19 17:01:19 -06:00
Thomas S Hatch
1d8b289db1 blast, put the try/except int he right place 2016-05-19 17:00:16 -06:00
Thomas S Hatch
081e6c5b83 maintain the fallabck because I am totally sick of this crap 2016-05-19 16:33:15 -06:00
Mike Place
755acfb97e Improve doc clarity for disable_modules documentation (#33379) 
* Improve doc clarity for disable_modules documentation

* Additional clarification on blacklisted name
 2016-05-19 16:31:41 -06:00
rallytime
35ad788470 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - conf/minion
  - doc/ref/configuration/minion.rst
  - salt/modules/boto_elb.py
  - salt/modules/sudo.py
  - salt/states/boto_elb.py
  - salt/transport/zeromq.py
 2016-05-19 16:22:36 -06:00
rallytime
8ef7697806 Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-05-19 16:00:35 -06:00
Mike Place
2b5ad128bf Better YAML syntax error handling (#33375) 
Closes #26574
 2016-05-19 15:56:45 -06:00
Nicole Thomas
38fbcf865f Add note about name parameter in git_pillar docs (#33369) 
Fixes #27737
 2016-05-19 13:14:14 -07:00
Nicole Thomas
49251993ff Add win_pkg to list of modules that support "version" in pkg.installed (#33362) 
Fixes #32913
 2016-05-19 13:13:57 -07:00
Nicole Thomas
7a400a9499 Add note to docs about api settings for Hipchat API v2 (#33365) 
Fixes #27779
 2016-05-19 13:13:10 -07:00
Denys Havrysh
37e1930b6e Add initscripts, SystemD service units and environment files for Debian (#32857) 2016-05-19 13:10:02 -07:00
jacobhammons
bb3e98cad2 Merge pull request #33372 from jacobhammons/release-update 
revved 2015.8 branch to .9 in version selector
 2016-05-19 14:05:35 -06:00
Jacob Hammons
5ce502160b revved 2015.8 branch to .9 in version selector 2016-05-19 14:04:26 -06:00
jacobhammons
80f52a658e Merge pull request #33370 from jacobhammons/2015.8.9 
Update docs version to 2015.8.9
 2016-05-19 13:59:15 -06:00
Nicole Thomas
3e5689abbf Merge pull request #33366 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-05-19 13:41:40 -06:00
Jacob Hammons
146b4df6be Updates docs version to 2015.8.9 
Adds note regarding the os grain on Mint Linux
Adds an FAQ regarding grains that change due to upstream changes
 2016-05-19 13:41:35 -06:00
rallytime
52b3128678 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/states/boto_elb.py
 2016-05-19 12:32:14 -06:00
Nicole Thomas
f248003ac2 Remove mentions of windows not supporting pkgs param (#33361) 
Fixes #33313
 2016-05-19 11:02:47 -07:00
Nicole Thomas
4fdb097c01 Update job_cache and keep_jobs docs to be more specific to their behavior (#33328) 
* Update job_cache and keep_jobs docs to be more specific to their behavior

Also fixed a bug discovered when investigating job_cache/keep_jobs functionality
where the jid directory and files were removed by the cache cleaner, but not the
original jid clash detection directory created in /var/cache/salt/master/jobs/.

Fixes #29286

* Add testcase for the changes in the local_cache.clean_old_jobs func

* Mark tests as destructive

* Put destructive test decorator in correct location
 2016-05-19 09:32:32 -07:00
Erik Johnson
2f06918dad Properly detect newer Linux Mint distros (#33359) 
* Properly detect newer Linux Mint distros

LMDE 2 and Linux Mint 17.3 changed the DISTRIB_ID in /etc/lsb-release to
``LinuxMint``, breaking OS detection for these distros.

This commit fixes that by adding an entry to the OS_NAME_MAP in the core
grains.

* Remove LinuxMint os_family from aptpkg.py

It is no longer necessary as the distro is now detected properly, which
will lead to an os_family of Debian.
 2016-05-19 09:04:04 -07:00
phistrom
55be0abf4d Expanded documentation for boto_elb state and module (#33341) 
* Describes what happens when the CNAME parameter is given.

* Describes what the recognized attributes are for for ELBs.
 2016-05-18 19:02:20 -06:00
Erik Johnson
d85096ce63 Fix UnboundLocalError in git.latest (#33340) 
Resolves #32260.
 2016-05-18 19:01:22 -06:00
phistrom
e602446d54 Describes parameters in register_instances function (#33339) 2016-05-18 19:00:56 -06:00
Nicole Thomas
5c29c65ff4 Fix some link errors in the test writing tutorial (#33347) 2016-05-18 18:57:50 -06:00
Shane Lee
e532e5883c Fix network.managed for windows (#33312) 2016-05-18 09:40:06 -07:00
C. R. Oldham
11a25255ec Bp 28467 calm mine (#33327) 
* make minion mine update behavior more configurable

* Add docs for mine_functions config var

* Remove config dup from mine config options

Refs #28467

* 2015.8 does not have _DFLT_MULTIPROCESSING_MODE

* This won't be in until 2015.8.10.
 2016-05-18 09:37:41 -07:00
C. R. Oldham
d375c1fe37 Add docs for mine_functions config var (#33326) 
* Add docs for mine_functions config var

* Note that mine_enabled essentially just doesn't add the mine
update function to the scheduler.
 2016-05-18 09:32:06 -07:00
Justin Findlay
b897f2cba8 import ps from psutil_compat in beacons (#33334) 
* beacons.network_info: import gate psutil

* beacons.ps: import gate psutil
 2016-05-18 09:31:38 -07:00
Justin Findlay
089c1a2513 remove redundant, incorrect sudo_runas config documentation (#33318) 
* remove sudo_runas documentation

`sudo_runas` was renamed to `sudo_user` and the documentation was not
updated accordingly.

* conf/minion: update sudo_user description

The description from sudo_runas was better.
 2016-05-18 09:15:42 -07:00
Erik Johnson
1f7fda212b Disambiguate non-exact matches when checking if sysv service is enabled (#33324) 
Fixes #33323
 2016-05-18 09:10:02 -07:00
Mike Place
8c1f19a7e6 Allow concurrency mode in state runs if using sudo (#33325) 
Closes #30130
 2016-05-18 09:04:45 -07:00
Dmitry Kuzmenko
ed14ef22b2 Fix master hanging after a request from minion with removed key. (#33333) 
* ZMQ monitor for MWorker connections.

* Reauth minion if the key was removed on the master side.
 2016-05-18 09:02:49 -07:00
Nicole Thomas
98383de11c Merge pull request #33322 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-05-17 17:01:07 -06:00
rallytime
d66c992918 Don't merge-forward the change to salt/scripts.py 2016-05-17 14:11:34 -06:00
rallytime
779f31cc20 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-05-17 13:41:19 -06:00
Nicole Thomas
daafa27b60 Cleanup comments in smbios.get output (fixes #33266) (#33306) 
As also noted in https://github.com/saltstack/salt/issues/33266, sometimes `dmidecode` will output additional commentary text in strings:

```
root@n01:~# dmidecode -s system-manufacturer                                                                                                                                                                                        
# SMBIOS implementations newer than version 2.8 are not
# fully supported by this version of dmidecode.
Supermicro
```

This PR filters those out.
 2016-05-17 13:31:41 -06:00
Nicole Thomas
ced3223b35 Back-port #32993 to 2016.3 (#33304) 
* privateIPs and privateDNS are expected to be JSON encoded strings (#32993)

* Import json
 2016-05-17 13:31:27 -06:00
gerhardqux
bfe12d9300 Fix iptables --match-set (#23643) (#33314) 
Function is expecting two arguments. But after processing state only one
parameter (it contain two words) is pushed into list of options.
This patch reverts the parsing of "iptables --match-set" to the
behaviour of salt v2014.*.

This is a backport of https://github.com/saltstack/salt/pull/28325

Closes #23643
 2016-05-17 13:31:06 -06:00
Nicole Thomas
d0ed1616b0 Merge pull request #33308 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-05-17 13:26:05 -06:00
Shane Lee
348c0364e1 Fix minion start retry on Windows (2016.3) (#33285) 
* Fix retry minion start for windows

* Implement Sergey's Fix
 2016-05-17 10:38:53 -07:00
rallytime
1c43a62f85 Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-05-17 11:23:41 -06:00
Justin Findlay
7455d0da9b update 2015.8.9 release notes (#33310) 2016-05-17 11:13:09 -06:00
Thomas S Hatch
e3eff27c55 Merge pull request #33293 from twangboy/fix_33277_2015_8 
Fix minion start retry on Windows (2015.8)
 2016-05-17 11:03:41 -06:00
Nicole Thomas
9b42a05519 Added some more docs for master and minion config settings (#33292) 
* Added some more docs for master and minion config settings

Configs addressed:
  - auth_safemode
  - auth_timeout
  - conf_file
  - gather_job_timeout
  - jinja_lstrip_blocks
  - jinja_trim_blocks
  - max_event_size

* Change "sub minion" to "sub-minion"
 2016-05-17 09:58:20 -07:00
Nicole Thomas
22c433184d linux_acl: Allow '-' as a separation character in ACL permissions. Fixes #31270 (#33172) (#33305) 
This allows using acl states with things like '- perms: r-x' or '- perms: r--', which also works when manually setting ACL's using setfacl.
 2016-05-17 09:53:20 -07:00