Commit Graph

5880 Commits

Author SHA1 Message Date
Nitin Madhok
44765bc785 Update intro_scale.rst 2016-04-19 11:41:05 -06:00
Nicole Thomas
992c70dc6a Update the minion.rst file with the new pub_ret option (#32654)
Also added the loop_interval docs to minion.rst and corrected
the default documented (this value is 1 second for the minion
schedule maintenance process, not 60 seconds - the master is 60).
2016-04-18 10:51:01 -06:00
Javier Bértoli
9cae281a3d varstack as master top (#32572)
* Add varstack as a master tops provider

* File modes

* Add ref/tops/all/salt.tops.varstack.rst

* Linting

* Linting

* Remove unused variable

* More linting

* PEP8 compliance
2016-04-18 08:58:53 -06:00
Nicole Thomas
9942ea9319 [develop] Merge forward from 2016.3 to develop (#32636)
* Ensure rh_service not used on CloudLinux 7

Add CloudLinux to RHEL-derived distros excluded from rh_service use in osrelease >= 7

* Fix binary search and replace (#32542)

* Don't return None from eval_master (#32555)

Raise an exception instead. Because eval master if returns should return
a tuple.

* redact passwords and hashes from user.present updates

Fixes #32381

* Better log message on minion restart if master couldn't be reached. (#32576)

* Revert PR #32480 and apply #32314 with fixes / documentation (#32558)

* Revert "Fix loop in maint.flo"

This reverts commit 5196cd6a6e5db3c7b1a47b1740881bbd3e87ea3d.

* Revert "Clear VCS fsbackend and git_pillar locks on master start"

This reverts commit 7e3caa9bae1ac4de62db9924374e35a8b826937e.

* Revert "Add functions to remove VCS fsbackend update locks and git_pillar update/checkout locks"

This reverts commit 4c2db32419022501eae2a695ec488693e043d189.

* prevent eternal gitfs lock due to process crash

* Use salt.utils.fopen() instead of open()

* Make pid locking work for more than just gitfs

Also, make logging more descriptive, to aid in troubleshooting.

* Add git_pillar_global_lock config option default value

* Document proper usage of {gitfs,git_pillar}_global_lock

* Fix comments value in salt.states.pkgrepo example (#32604)

'comments' option adds '#' automatically. Example contains `#http://mirror.centos.org/centos/$releasever/os/$basearch/` string which becomes prefixed with '##' in generated file.

* alphabetize directories for dynamic modules (#32599)

Also add engines and proxy minions to the list.

* Expand on the open-source vs open-core FAQ

* Language clarification.

* Fix some mistakes in the salt-ssh thin shell script (#32583)

* [[ is bash, not compatible with /bin/sh

* check if python command exists before calling it

* Deprecate 'user' and 'group' in state cmd (#32613)

* Remove unused 'group' argument

* Fix unit testing of cmd.mod_run_check without group arg

* Deprecate 'user/group' in cmd.run

* Deprecate 'user'/'group' in cmd.script

* Deprecate 'user' in cmd.wait

* Deprecate 'user'/'group' in cmd.wait_script

* Fix mod_run_check without 'group'

* Push deprecation back one release

* Fix mac_service and mac_system modules (#32587)

* Fix mac_service module

* Add integration tests for new functions

* Start will not enable the service beforehand

* Remove unused variables
2016-04-18 08:40:20 -06:00
Thomas S Hatch
22c6895d63 Thormods (#32600)
* add basic runner caller to thorium

* add basic wheel module

* only start the reactor if it is configured and add it correctly to the engines

* fix lint and a syntax error I forget to get into the PR

* add break to speed things up a bit

* bah! whitespace!
2016-04-15 12:07:05 -06:00
Jacob Hammons
517cdf7680 This module is making a call that is breaking the doc build, removing until I can figure it out. 2016-04-14 16:23:15 -06:00
Jacob Hammons
2c74ac1f04 Refreshes the doc module list 2016-04-14 15:28:18 -06:00
Felix Hummel
6d38518560 mention /etc/salt/minion_id in docs explicitly (#32573)
This file is essential if one needs to change a minion's ID. Showing the
full path to the file makes it easier searching for it, e.g. Google::

    http://blog.mindfab.net/2013/11/salt-changing-minions-hostname.html
2016-04-14 10:36:28 -06:00
Nicole Thomas
78bd479d6e Merge pull request #32547 from cro/opencorefaq
Expand on the open-source vs open-core FAQ
2016-04-14 09:50:26 -06:00
rallytime
efe3ec82da Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/modules/glusterfs.py
  - salt/modules/service.py
  - tests/unit/modules/glusterfs_test.py
2016-04-13 16:10:33 -06:00
C. R. Oldham
5ce07fc1c6 Language clarification. 2016-04-13 15:13:37 -06:00
Thomas S Hatch
c8facc5dae these are no longer loaded by the loader and proved to be (#32548)
more trouble that they were worth.
2016-04-13 12:55:54 -06:00
C. R. Oldham
8c88229aba Expand on the open-source vs open-core FAQ 2016-04-13 11:16:26 -06:00
rallytime
b77993d9a1 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/ref/configuration/minion.rst
  - doc/topics/targeting/grains.rst
  - salt/crypt.py
  - salt/scripts.py
  - salt/states/dockerng.py
  - salt/states/pkg.py
2016-04-13 09:42:54 -06:00
rallytime
fbaeb165c9 Merge branch '2015.5' into merge-2015.8
No conflicts.
2016-04-13 09:07:39 -06:00
rallytime
46a4e8a310 Remove merge conflict line 2016-04-13 09:05:31 -06:00
Andrew Pashkin
e0d947c707 Document "grains" setting in the minion configuration reference 2016-04-13 08:56:05 -06:00
Andrew Pashkin
e9da85ba91 Fix YAML-block in "Organizing Pillar data" part of "Salt Formulas" docs page (#32527) 2016-04-13 08:06:19 -06:00
Andrew Pashkin
bb4d47dc93 Document "grains" setting in the minion configuration reference (#32528) 2016-04-13 08:01:57 -06:00
Thomas S Hatch
829f1b0d58 Fix rendering error with thorium docs 2016-04-12 13:58:12 -06:00
Archie
fd6dd86fae Small typo fix (#32498) 2016-04-12 08:14:44 -06:00
Nicole Thomas
216d9fdc9a [develop] Merge forward from 2016.3 to develop (#32494)
* fix sorting by latest version when called with an attribute

* remove reference to master_alive_check

* Fixes saltstack/salt#28262

* Resolve memory leak in authentication

* outputter virt_list does not exist anymore

* Update proxmox documentation

* Fix documentation on boto_asg and boto_elb modules and states

* modules.win_timezone: don't list all zones in debug log

* Correcty index glusterfs bricks

Fixes issue #32311

* Cleaner deprecation process with decorators

* Add deprecation decorator scaffold

* Capture type error and unhandled exceptions while function calls

* Aware of the current and future version of deprecation

* Implement initially is_deprecated decorator

* Add an alias for the capitalization

* Fix capitalization easier way

* Remove an extra line

* Add successor name to the deprecation decorator.

* Granulate logging and error messages.

* Implement function swapper

* Raise later the caught exception

* Clarify exception message

* Save function original name

* Remove an extra line

* Hide an alternative hidden function name in the error message, preserving the error itself

* Rename variable as private

* Add a method to detect if a function is using its previous version

* Message to the log and/or raise an exception accordingly to the status of used function

* Log an error along with the exception

* Add internal method documentation

* Add documentation and usage process for decorator "is_deprecated"

* Add documentation and process usage for the decorator "with_deprecated"

* Hide private method name

* Fix PEP8, re-word the error message

* Deprecate basic uptime function

* Add initial decorator unit test

* Rename old/new functions, mock versions

* Move frequent data to the test setup

* Add logging on EOL exception

* Rename and document high to low version test on is_deprecated

* Implement a test on low to high version of is_deprecated decorator

* Add a correction to the test description

* Remove a dead code

* Implement a test for high to low version on is_deprecated, using with_successor param

* Correct typso adn mistaeks

* Implement high to low version with successor param on is_deprecated

* Setup a virtual name for the module

* Implement test for with_deprecated should raise an exception if same deprecated function not found

* Implement test for with_deprecated an old function is picked up if configured

* Correct test description purpose

* Implement test with_deprecated when no deprecation is requested

* Add logging test to the configured deprecation request

* Add logging testing when deprecated version wasn't requested

* Implement test EOL for with_deprecated decorator

* Correct test explanation

* Rename the test

* Implement with_deprecated no EOL, deprecated other function name

* Implement with_deprecated, deprecated other function name, EOL reached

* Add test description for the with_deprecated + with_name + EOL

* Fix confusing test names

* Add logging test to the is_deprecated decorator when function as not found.

* Add more test point to each test, remove empty lines

* Bugfix: at certain conditions a wrong alias name is reported to the log

* Fix a typo in a comment

* Add test for the logging

* Disable a pylint: None will _never_ be raised

* Fix test for the deprecated "status.uptime" version

* Bugfix: Do not yank raised exceptions

* Remove unnecessary decorator

* Add test for the new uptime

* Add test for the new uptime fails when /proc/uptime does not exists

* Rename old test case

* Skip test for the UTC time, unless freeze time is used.

* Fix pylint

* Fix documentation

* Bugfix: proxy-pass the docstring of the decorated function

* Lint fix

* Fixes saltstack/salt#28262 for 2015.5 branch

* Update master config docs

* Improve git_pillar documentation/logging

* Add note about different behavior of top file in git_pillar

* Make log entry for a missing pillar SLS file more accurate for git_pillar

* FreeBSD supports packages in format java/openjdk7 so the prior commit broke that functionality. Check freebsd/pkg#1409 for more info.

* FreeBSD supports packages in format java/openjdk7 so the prior commit broke that functionality. Check freebsd/pkg#1409 for more info.

* Update glusterfs_test to be inline with #32312

* Fix salt-cloud paralell provisioning

Closes #31632

* Ignore Raspbian in service.py __virtual__ (#32421)

* Ignore Raspbian in service.py __virtual__

This prevents more than one execution module from trying to load as the
service virtual module.

Refs: #32413

* pack __salt__ before loading provider overrides

We can (and should) pack here since we're just packing a reference to the
object. __salt__ needs to be available when we're loading our provider
overrides

* Fix broken __salt__ dict in provider override

Using ret.items() here sets ``__salt__`` to its items (tuple containing
function name and reference), breaking usage of ``__salt__`` inside
overridden functions.

* Merge #32293 with test fixes (#32418)

* Fix issue #11497

* Remove check for working directory presence in tests

* Fix Domainname introspection

Default value needs to be extracted from the container itself,
because dockerd set Domainname value when network_mode=host.

* Add pgjsonb_queue to queue doc index

* Pylint fixes

* Pass parser options into batch mode

Resolves #31738

* Changed the target file in file.symlink test (#32443)

* Argument name in docs should match actual arg name (#32445)

Fixes #31851

* tests.integration: bypass MacOS TMPDIR, gettempdir (#32447)

Updates 0edd532, 8f558a5.

When logging in as root over `ssh root@host`, `$TMPDIR` and
`tempfile.gettempdir()` are both set to a variation of:
```
/private/var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/
```
When logging in as root over `sudo -i`, `$TMPDIR` is unset and
`tempfile.gettempdir()` is set to `/tmp`.

My guess is that the second case is an unintended or uncorrected omision
by Apple as they have introduced the longer, randomized temp path in a
recent version of MacOS.

* Issue #28706: Fix state user.present behavior. (#32448)

- As mentionned in issue #28706, state user.present no longer remove
      user from groups if the keyword 'groups' with empty value '[]' is not
      explicitly set, salt will assume current groups are still wanted.

* tests.integration: fix 4230c8a

* Move the tables of virtual modules to individual documentation pages

* Add new doc pages to toctree

* Add external ref to windows package manager docs

* Improve docstrings

* Add documentation on virtual module provider overrides to the module docs

* Clarify the scope of the provider param in states.

* Add link to provider override docs to all package providers

* Add link to provider override docs to all service providers

* Add link to provider override docs to all user providers

* dd link to provider override docs to all shadow providers

* Add link to provider override docs to all group providers

* Backport 31164 and 31364 (#32474)

* Don't send REQ while another one is waiting for response.

The message has to be removed from the queue the only *after* it's
already processed to don't confuse send() functionality that expects
empty queue means: there's no active sendings.

* Fixed zeromq ReqMessageClient destroy

* Add link to provider override docs to opkg.py

This is a companion to https://github.com/saltstack/salt/pull/32458, but
this module was not added until the 2016.3 branch, so the documentation
is being updated there for this module.

* Add documentation for some master/minion configs (#32454)

Refs #32400

Adds docs for:

- cli_summary
- event_return_queue
- event_return_whitelist
- event_return_blacklist
- file_recv_max_size
- fileserver_followsymlinks
- fileserver_ignoresymlinks
- fileserver_limit_traversal

* Automatically detect correct MySQL password column for 5.7 and fix setting passwords (#32440)

* Automatically detect MySQL password column

* Fix changing password in MySQL 5.7

* Fix lint test

* Fix unit tests (?)

They will still fail if "authentication_string" is legitimately the right column name, but I don't know what to do about that.

* Additional unit test fix

* Only unsub if we have a jid

Closes #32479
2016-04-11 17:07:15 -06:00
Nicole Thomas
e335e313fe Merge pull request #32487 from terminalmage/epoch-documentation
Add explanation of nonzero epoch requirement to pkg.installed state documentation
2016-04-11 14:48:57 -06:00
rallytime
4f03f2311f Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cli/salt.py
  - salt/modules/win_pkg.py
  - salt/transport/tcp.py
2016-04-11 14:33:21 -06:00
Erik Johnson
e04cf879b6 Document new behavior of pkg.installed for yum/dnf packages with non-zero epoch 2016-04-11 14:42:23 -05:00
rallytime
1b04f0ddec Merge branch '2015.5' into '2015.8'
Conflicts:
  - doc/ref/configuration/minion.rst
  - doc/ref/modules/all/index.rst
  - doc/ref/modules/index.rst
  - salt/modules/systemd.py
  - salt/modules/zypper.py
2016-04-11 11:33:08 -06:00
Nicole Thomas
29333e533e Add documentation for some master/minion configs (#32454)
Refs #32400

Adds docs for:

- cli_summary
- event_return_queue
- event_return_whitelist
- event_return_blacklist
- file_recv_max_size
- fileserver_followsymlinks
- fileserver_ignoresymlinks
- fileserver_limit_traversal
2016-04-11 10:49:52 -06:00
kaihowl
b465d54a76 Fix broken links in topics/development/contributing.rst 2016-04-09 19:09:17 +02:00
Erik Johnson
f9306347cc Clarify the scope of the provider param in states. 2016-04-08 22:05:36 -05:00
Erik Johnson
af24c82ab0 Add documentation on virtual module provider overrides to the module docs 2016-04-08 22:01:14 -05:00
Erik Johnson
1948920674 Add external ref to windows package manager docs 2016-04-08 22:00:06 -05:00
Erik Johnson
e7fa21438c Add new doc pages to toctree 2016-04-08 21:59:21 -05:00
Erik Johnson
f0de1236ec Move the tables of virtual modules to individual documentation pages 2016-04-08 21:58:11 -05:00
Nicole Thomas
8d44aa3f08 Merge pull request #32429 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-04-08 10:56:12 -06:00
rallytime
7f8eb751a0 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/cli/daemons.py
  - salt/modules/win_servermanager.py
  - tests/unit/modules/win_servermanager_test.py
2016-04-08 10:09:03 -06:00
rallytime
1fa7c021b3 Add pgjsonb_queue to queue doc index 2016-04-08 09:08:17 -06:00
rallytime
59b804d230 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/pkgng.py
  - salt/modules/status.py
  - salt/states/boto_asg.py
  - salt/states/boto_elb.py
2016-04-07 16:28:59 -06:00
rallytime
9531ea6ef5 Merge branch '2015.5' into '2015.8'
Conflicts:
  - doc/topics/highavailability/index.rst
  - salt/loader.py
  - salt/modules/service.py
  - salt/states/cmd.py
  - tests/unit/states/cmd_test.py
2016-04-07 16:10:32 -06:00
Justin Findlay
b27ccc424b update release candidate testing doc (#32414) 2016-04-07 09:41:46 -06:00
Erik Johnson
709410ada3 Improve git_pillar documentation/logging
* Add note about different behavior of top file in git_pillar

* Make log entry for a missing pillar SLS file more accurate for git_pillar
2016-04-07 09:10:53 -06:00
Nicole Thomas
c53efc3349 Update master config docs 2016-04-07 09:10:19 -06:00
rallytime
f31f26b5ed Change some config defaults in the Carbon release 2016-04-06 15:38:51 -06:00
Mike Place
3f03c5fcf9 Merge pull request #32374 from cachedout/issue_32066
Update proxmox documentation
2016-04-05 16:25:16 -06:00
Mike Place
62389d1d1a Update proxmox documentation 2016-04-05 16:24:26 -06:00
rallytime
760f479424 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/scripts.py
  - salt/state.py
  - tests/unit/config/config_test.py
2016-04-05 15:09:27 -06:00
C. R. Oldham
3bbe284d89 Remove 'experimental' warning from SDB docs. 2016-04-05 09:42:34 -06:00
Ch3LL
2774da288d remove reference to master_alive_check 2016-04-04 13:49:33 -06:00
rallytime
d7b4b8b081 Merge branch '2015.5' into '2015.8'
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/configuration/minion.rst
  - salt/config.py
2016-04-04 12:36:14 -06:00
Mike Place
9065201761 Merge pull request #32316 from vutny/update-bootstrap-tutorial
Update Salt Bootstrap tutorial
2016-04-04 11:18:12 -06:00
Benjamin Drung
a7db152333 Fix typo dont -> don't 2016-04-04 14:56:29 +02:00