Commit Graph

61855 Commits

Author SHA1 Message Date
Mihai Dincă
c8b4f338d8 Make --gpg-auto-import-keys a global param when calling zypper (#33432) 2016-05-23 14:15:29 -07:00
Nicole Thomas
0c4e38ced4 Fix the saltutil.wheel function and add integration tests (#33414)
* Fix the saltutil.wheel function and add integration tests

Fixes #32446

* Provide a more useful message when command is run on non-local minion
2016-05-23 14:11:16 -07:00
Nicole Thomas
e4f00f92c4 Make sure the path we're removing is present first - avoid an OSError (#33440)
* Make sure the path we're removing is present first - avoid an OSError

* Make check for t_path more efficient

* whitespace
2016-05-23 14:04:18 -07:00
Nicole Thomas
93fd00b83d Avoid a syntax error by using " instead of escaped ' (#33443)
Fixes #26913
2016-05-23 13:45:42 -07:00
Rigel Marcinik
ec60b9c45c Fix virtual function (#33436)
exec_action is not present in the bigip execution module, so change it to list_transaction.
2016-05-23 11:56:50 -06:00
Nicole Thomas
6e94a4a03b Merge pull request #33438 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-05-23 11:50:51 -06:00
Alejandro Bednarik
c9d0de46cc Documentation update in file.serialize. (#33421)
Updated versionadded for dataset_pillar.
2016-05-23 09:50:49 -06:00
rallytime
7c41c34528 Merge branch '2015.5' into '2015.8'
No conflicts.
2016-05-23 09:40:21 -06:00
Justin Findlay
2cc650965a update 2015.5.11 release notes (#33412) 2016-05-20 15:08:35 -06:00
Nicole Thomas
dc8ce2d8b1 Fix traceback in logging for config validation (#33386) (#33405) 2016-05-20 13:48:15 -07:00
lvg01
f8a90eb71f Fix LVM parameter devices as a pure list. Comma seperated lists are c… (#33398)
* Fix LVM parameter devices as a pure list. Comma seperated lists are converted as list for backwards compatibility.

Example:

vg_test:
  lvm.vg_present:
    - devices:
      - /dev/vdb
      - /dev/vdc

Old way te do it:

vg_test:
  lvm.vg_present:
    - devices: /dev/vdb,/dev/vdc

This fix also includes pv devices

* Modified code python3 compliant as suggested by Mike Place.

isinstance(devices, str) > isinstance(devices, six.string_types)

* Fixed typo

* Added extra blank line before def __virtual__ which disappeared by adding the preceding import of six
2016-05-20 13:47:48 -07:00
Nicole Thomas
3989e5b3de Spelling correction. (#33406) 2016-05-20 13:15:08 -07:00
Loren Gordon
9accb534b1 Update windows pkg.[install|remove] error logic (#33321)
* Update windows pkg.install error logic

* Use `cmd.run_all` to capture the entire return dictionary.
* Send `output_loglevel='quiet'` to `cmd.run_all` to suppress its
outputting of errors on non-zero return codes.
* Check the return code to determine whether the install failed.
* Catch retcode == 3010 as a successful install that just requires
a reboot.
* Improve the error message when a package is not detected in the
registry, particularly to mention packages that install as Windows
updates.
* Add a message to the return dictionary about successful vs failed
installs. This helps minimize confusion where the package is not
detected in the registry.

Fixes #33298

* Update retcode logic of pkg.remove
2016-05-20 10:49:28 -07:00
Nicole Thomas
04ac89d488 Add note about reload_modules functionality for pkg.installed (#33374)
Fixes #29252
2016-05-20 10:32:47 -07:00
Nicole Thomas
637c2af0ad Add note to absolute_imports practice about __future__ import (#33377)
Fixes #31430
2016-05-20 10:32:25 -07:00
Nicole Thomas
d35b81de35 Document how to set the alias file location for alias state (#33380)
Fixes #21720
2016-05-20 10:28:02 -07:00
jacobhammons
3c9def310c Merge pull request #33403 from jacobhammons/dot10
2015.8.10 release notes
2016-05-20 10:02:50 -06:00
Jacob Hammons
e850c298a9 2015.8.10 release notes 2016-05-20 10:01:32 -06:00
Nicole Thomas
91059224f6 Merge pull request #33381 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-05-20 09:58:11 -06: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
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
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