Commit Graph

69587 Commits

Author SHA1 Message Date
abednarik
2fe6f4e16a modules.debbuild: __virtual__ return err msg.
Updated message in debbuild module when return False if OS family is not supported.
2016-05-22 23:01:42 -03:00
Justin Findlay
2cc650965a update 2015.5.11 release notes (#33412) 2016-05-20 15:08:35 -06:00
Mike Place
cf81afab47 Port of #33325 to 2016.3 (#33411) 2016-05-20 15:07:27 -06:00
Nicole Thomas
336fbb03bc [develop] Merge forward from 2016.3 to develop (#33408)
* 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.

* Allow concurrency mode in state runs if using sudo (#33325)

Closes #30130

* Disambiguate non-exact matches when checking if sysv service is enabled (#33324)

Fixes #33323

* 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.

* import ps from psutil_compat in beacons (#33334)

* beacons.network_info: import gate psutil

* beacons.ps: import gate psutil

* 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.

* 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.

* Fix network.managed for windows (#33312)

* Fix some link errors in the test writing tutorial (#33347)

* Describes parameters in register_instances function (#33339)

* Fix UnboundLocalError in git.latest (#33340)

Resolves #32260.

* 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.

* 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.

* 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

* Remove mentions of windows not supporting pkgs param (#33361)

Fixes #33313

* 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

* revved 2015.8 branch to .9 in version selector

* Add initscripts, SystemD service units and environment files for Debian (#32857)

* Add note to docs about api settings for Hipchat API v2 (#33365)

Fixes #27779

* Add win_pkg to list of modules that support "version" in pkg.installed (#33362)

Fixes #32913

* Add note about name parameter in git_pillar docs (#33369)

Fixes #27737

* Better YAML syntax error handling (#33375)

Closes #26574

* Improve doc clarity for disable_modules documentation (#33379)

* Improve doc clarity for disable_modules documentation

* Additional clarification on blacklisted name

* maintain the fallabck because I am totally sick of this crap

* blast, put the try/except int he right place

* restore whitespace

* Fix traceback in logging for config validation (#33386)

* 2015.8.10 release notes

* Sync pillarstack to latest upstream version (#33391)

* Don't lay down all available opts (#33385)

* Don't lay down all available opts

* We need at least one opt in there

* Condense defaults

* Put the default hash type back
2016-05-20 13:48:40 -07: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
Joseph Hall
2d2a714295 Don't declare the default network (#33409)
* Don't declare the default network

* Handle other occurance of "network"
2016-05-20 14:24:53 -06: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
Dmitry Kuzmenko
17b03e9d8b Allow to blacklist/whitelist renderers. (#33358)
* Allow to blacklist/whitelist renderers.

* Fix tests.

* Unit test for renderer blacklisting.

* Minor tests fixes
2016-05-20 10:41:51 -07:00
Nicole Thomas
7d45e920c7 Merge pull request #33404 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-05-20 11:36:55 -06: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
Joseph Hall
4b62c9b98c Don't lay down all available opts (#33385)
* Don't lay down all available opts

* We need at least one opt in there

* Condense defaults

* Put the default hash type back
2016-05-20 11:16:52 -06:00
Bruno Binet
0e206e94fb Sync pillarstack to latest upstream version (#33391) 2016-05-20 10:03:22 -07:00
rallytime
1febb0e13a Merge branch '2015.8' into '2016.3'
No conflicts.
2016-05-20 10:35:25 -06: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
Nicole Thomas
a937b7ec22 Merge pull request #33382 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-05-20 09:55:16 -06:00
Tom Eastman
aba45e9be3 Spelling correction. (#33387) 2016-05-20 09:50:39 -06:00
Joao Mesquita
0f4d7b3bbf Fix linting 2016-05-19 23:18:21 -03: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
Hannes Körber
5ad305cedf
firewalld: Add service state. 2016-05-20 01:04:49 +02:00
Hannes Körber
b8a889497a
firewalld: Change behavior of present state.
See issue #33159 for an explanation:

https://github.com/saltstack/salt/issues/33159
2016-05-20 01:01:43 +02:00
Hannes Körber
f27ac3c180
firewalld: Use set operations.
The nested for-loops and if-statements are replaced with simple set
differences. This is more concise and readable.
2016-05-20 01:01:43 +02:00
Hannes Körber
317b7002bb
firewalld: Simlify port forwarding.
Forwarding rules are now represented as objects, which makes comparison
much easier. Also, parsing of the salt-specific syntax for port forwards
is done in a single function, `_parse_forward()`.
2016-05-20 01:01:43 +02:00
Hannes Körber
5c1b8fc246
firewalld: Add methods for modifying services.
The methods to not have a `permanent` parameter because those operations
are only allowed for the permanent configuration anyway.
2016-05-20 01:01:42 +02:00
Hannes Körber
59d8a3a5a1
firewalld: Add reload() method to module.
reload_rules() was chosen over reload() because of pylint complaining
about redefining the reload() builtin.
2016-05-20 01:01:42 +02: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
jacobhammons
9f42882ed7 Merge pull request #33373 from jacobhammons/release-update-dev
revved latest to 2015.8.9
2016-05-19 14:11:28 -06:00
Jacob Hammons
c56d25cf02 revved latest to 2015.8.9, added note regarding Mint Linux to 2015.8.9 release notes 2016-05-19 14:10:27 -06: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