Commit Graph

69459 Commits

Author SHA1 Message Date
Seth House
e074a64f1f Add config option for allowing users to set the expiry of eauth tokens 2016-05-25 13:29:40 -06:00
Seth House
9ba3b5aa69 Add auth runner to manage eauth keys 2016-05-25 13:29:40 -06:00
Mike Place
dd10fdc8ba Merge pull request #33416 from sangoma/files_diff_event
Add files map to fileserver cache event
2016-05-24 10:49:42 -07:00
Stefan Schweer
30219ab5b3 Cloud azure (#33468)
* suppress annoying NameError for salt-cloud

* suppress annoying NameError for salt-cloud

* fixed lint errors
2016-05-24 10:39:42 -06:00
Mike Place
541fde64b7 Merge pull request #33434 from whatevsz/fix-reactor
Fix reactor engine not being loaded.
2016-05-24 09:19:03 -07:00
skizunov
ed37b59e96 Fix: Sometimes reactor does not find runner function (#33460)
salt/utils/reactor.py:
- The reactor currently spawns a thread for each reaction. Previously, the
runner symbols were loaded in the spawned threads when iterated via
`verify_fun()` in `salt.client.mixins.SyncClientMixin._low()`. This
sometimes caused race conditions when two threads were trying to handle
a similar reactor (eg presence events) and hence were both invoking
`verify_fun`. The second thread sometimes would not be able to find the
module function and fail. Now we load the module functions before
spawning the thread.
- Do the same thing for wheel functions since it seems to have the
exact same race condition.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-05-24 08:53:41 -07:00
Shane Lee
091f3e12bc Return full pending computer name (develop) (#33461)
* Return full pending computer name

* Fix logic in set_computer_name
2016-05-24 08:13:15 -07:00
Nicole Thomas
f6fd5cb88b Merge pull request #33456 from rallytime/merge-develop
[develop] Merge forward from 2016.3 to develop
2016-05-24 08:58:35 -06:00
Alejandro Bednarik
6de2462b15 modules.zabbix: __virtual__ return err msg. (#33471)
Updated __virtual__ err message when Zabbix is not installed.
2016-05-24 07:05:40 -07:00
rallytime
5fd6ed04f5 Pylint 2016-05-23 17:01:05 -06:00
rallytime
e6bbc82b58 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/grains/core.py
  - salt/modules/aptpkg.py
  - salt/pillar/stack.py
  - salt/returners/local_cache.py
  - salt/runners/manage.py
2016-05-23 16:22:37 -06:00
Nicole Thomas
6e77d2946b Merge pull request #33453 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-05-23 16:07:41 -06:00
rallytime
3aa1e6701c Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/win_pkg.py
2016-05-23 15:10:06 -06: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
Moe
f48aa8f565 Add advanced settings config to win_iis (#33407) 2016-05-23 14:02:14 -07:00
Mike Place
a4abcc3d03 Remove rabbitmq unit tests (#33451)
* Remove completely pointless RabbitMQ unit test

Why would we even write tests to check to see if a mocked object
returns a string and then assert against that string?! This is absurd.

* Spurious print
2016-05-23 13:57:22 -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
Nicole Thomas
5d6e447bb7 Move 2016.40 --> Carbon versionadded tag (#33441) 2016-05-23 12:17:11 -06:00
msciciel
5daf7201c3 ckEthtool state (#33394)
* Correct docstrings in ethtool module

* New state ethtool
2016-05-23 11:58:59 -06:00
Kai Howelmeyer
e1119fea4e Fix typo in file.directory max_depth help (#33420) 2016-05-23 11:57:29 -06: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
Nicole Thomas
ede804b4f6 Merge pull request #33426 from abednarik/virtual_ret_debbuild_module
modules.debbuild: __virtual__ return err msg.
2016-05-23 11:23:00 -06:00
Hannes Körber
83aacc3b32
Fix reactor engine not being loaded.
The reactor engine was not loaded when there was not explicitly defined
in the configuration file. See issue #33090
2016-05-23 18:03:33 +02:00
Alejandro Bednarik
085e70a9d2 modules:multiple boto __virtual__ return err msg. (#33425)
Updated __virtual__ err msg fot he following boto modules: boto_cloudtrial, boto_datapipeline, boto_iot, boto_s3_buscket
2016-05-23 09:53:53 -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
ghoz
9e6ae66bb2 adds missing versionadded (#33419)
* adds missing versionadded 

adds missing  versionadded to states.archive.extracted:
trim_outpout and source_hash_changed appeared in v2016.3

* broke docstring indentation
2016-05-23 08:21:24 -07:00
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