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
75,848 Commits 24 Branches 182 Tags 341 MiB
3ef809fb0f
Commit Graph

6592 Commits

Author SHA1 Message Date
Erik Johnson
a56bf8bd2d Update references to future default value change that was reverted (#36924) 2016-10-11 16:33:41 -06:00
Erik Johnson
e5425f3e8c Revert change in default value for top_file_merging_strategy (#36922) 
This causes problems when a Carbon master tries to run states on a
non-Carbon minion.
 2016-10-11 16:33:23 -06:00
Jacob Hammons
102f909bb4 Add FreeBSD and SmartOS to RC packages list (#36916) 2016-10-11 16:30:50 -06:00
Daniel Wallace
727d4f309a allow for closing stuff in beacons 
Like the filehandler for inotify
 2016-10-11 12:34:42 -05:00
Jacob Hammons
dff93f89ff Update list of RC build platforms, fix example (#36887) 2016-10-10 11:36:48 -06:00
rallytime
9ae34b2329 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/topics/beacons/index.rst
 2016-10-10 10:19:50 -06:00
Jorge Schrauwen
0b304e75a3 missing docs for salt.modules.apcups (#36863) 2016-10-08 19:51:45 -06:00
Mike Place
9a819693ff Merge pull request #36845 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-08 14:29:10 +09:00
Jacob Hammons
d179423a23 Doc updates for Carbon release candidate (#36847) 2016-10-07 13:50:03 -06:00
rallytime
f73bdf55c2 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/ini_manage.py
  - salt/states/glance.py
 2016-10-07 09:51:21 -06:00
Justin Findlay
b2eccdefd5 doc.topics.beacons: reflow text at 80 chars 2016-10-06 17:06:10 -06:00
Justin Findlay
b181f9890d doc.topics.{reactor|beacons}: unify examples, many minor edits 2016-10-06 17:06:10 -06:00
Justin Findlay
28b4e30009 doc.glossary: use parenthesis 2016-10-06 16:17:22 -06:00
Justin Findlay
82cf39db00 doc.glossary: add JID 2016-10-06 16:17:22 -06:00
Justin Findlay
cc071b75cb doc.glossary: add idempotent 2016-10-06 16:17:22 -06:00
Mike Place
4bdb997dae Merge pull request #36785 from cachedout/pr-36728 
Fixup merge forward #36728
 2016-10-05 20:02:16 +09:00
rallytime
24b8bba145 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-30 16:13:08 -06:00
Yoram Hekma
3bb2cb6379 Update doc to reflect the version where 'none' was added as a pillar_source_merging_strategy 2016-09-30 15:59:21 -06:00
rallytime
555ae9aa9b Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-30 10:13:39 -06:00
Erik Johnson
3d15eedfe0 Add additional information about onchanges/onchanges_in 2016-09-29 23:02:39 -05:00
Erik Johnson
57ecbe6c53 Update minion restart example to use onchanges instead of cmd.wait 2016-09-29 23:02:10 -05:00
Justin Findlay
4dd4fc94dc log levels doc: try long form table 
sphinx didn't render the shorthand table
 2016-09-29 10:11:06 -06:00
rallytime
112903ad7e Merge branch '2016.3' into 'carbon' 
Conflicts:
  - conf/master
  - doc/ref/configuration/master.rst
  - salt/cli/daemons.py
  - salt/client/ssh/__init__.py
  - salt/config/__init__.py
  - salt/modules/archive.py
  - salt/modules/cmdmod.py
  - tests/unit/states/service_test.py
 2016-09-29 09:56:43 -06:00
Aneesh Agrawal
ffb717fec3 archive.extracted: Use user/group, not archive_user 
Ensure that any created parent directories are made with `user`/`group`
perms, not as the `archive_user` user. This also allows setting the
group for these dirs instead of defaulting to `root`.

The `archive_user` argument to archive.extracted has been deprecated
since version 2014.7.2, and supplanted by the `user` parameter in
2015.8.0, with a logged warning until Boron. Now that 2016.3.0 is out,
complete the deprecation by:
- no longer silently using `archive_user` in `archive.extracted`,
  preferring instead `user` and `group`,
- no longer accepted `archive_user` as an argument.

Also update man page.
 2016-09-28 10:14:59 -06:00
rallytime
da574e5b03 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/config/__init__.py
  - salt/runners/thin.py
 2016-09-28 09:01:24 -06:00
Bo Maryniuk
a441b35588 Add documentation about Salt Thin configuration 2016-09-27 11:12:07 +02:00
Mike Place
7b43d4322c
Merge branch '2016.3' into 2016_3_carbon 2016-09-27 16:44:42 +09:00
Mike Place
1e6a60ab01
Update boostrap docs to recent versions of Ubuntu 
Closes #36586
 2016-09-27 15:17:58 +09:00
David Boucha
9d3ad82ae5 Merge pull request #36222 from damon-atkins/update_to_35899_win_pkg 
Update to PR 35899 win_pkg
 2016-09-26 21:01:30 -06:00
Erik Johnson
58dd0d5cdc Cleanup for #36222 (#1) 
Updates to  salt/states/pkg.py, modules/win_pkg.py, doc/ref/configuration/minion.rst
 2016-09-27 11:36:42 +10:00
rallytime
d5bbd91c14 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - conf/master
 2016-09-23 17:01:17 -06:00
Nicole Thomas
5548ed771d Back-port #36435 to 2016.3 (#36532) 
* Added "none" option for pillar_source_merging_strategy

* added none to merging strategy in dictupdate so we no longer log warnings when it is selected

* Updated documentation

* fix for when pillar_source_merging_strategy is not set

* Fix looking up pillar data when merging is set to "none" and no saltenv was passed

* Fix looking up pillar data when merging is set to "none" and no saltenv was passed retry

* Let's not break when no merging strategy is passed

* Capitalisation

* Update on doc
 2016-09-23 13:36:23 -06:00
rallytime
d0ec4ead2a Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-23 08:32:17 -06:00
Erik Johnson
2df51ce3e9 Rewrite minionfs walkthrough 
This walkthrough did not reflect the blacklist/whitelist or mountpoint
features, this commit rewrites it.
 2016-09-22 18:23:32 -05:00
Erik Johnson
cc9d41fb0e Change items in minionfs blacklist/whitelist example 
These were copypasta'ed from gitfs' blacklist/whitelist example, but
they aren't as apropos here because the blacklist/whitelist for minionfs
is meant to refer to minion IDs, not branches/tags like in gitfs.
 2016-09-22 18:22:03 -05:00
rallytime
1755f22de1 Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-22 10:01:17 -06:00
Mike Place
ec4f4f49ca Merge pull request #36478 from rallytime/fix-36475 
Add the "bash" option to the "code-block"directive.
 2016-09-22 13:15:14 +09:00
Erik Johnson
4839c325ae Improve the rebase docs in contributing guidelines 
These docs do not tell people how to deal with branch diversions which
happen as a result of a rebase, and could lead (let's be real, probably
_has led_) to users pulling/merging, which will add a buttload of
unrelated commits to their pull request.

This update shows how to force-push when necessary.
 2016-09-21 13:53:27 -05:00
rallytime
77f8120395 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/topics/installation/windows.rst
  - salt/engines/sqs_events.py
  - salt/grains/core.py
 2016-09-21 10:43:38 -06:00
rallytime
7be7d5832f Add the "bash" option to the "code-block"directive. 
Fixes #36475

By adding the "bash" argument, we avoid the following error and the docs
will display appropriately:
```
/root/SaltStack/salt/doc/topics/tutorials/gitfs.rst:918: ERROR: Error in "code-block" directive:
1 argument(s) required, 0 supplied.

.. code-block::

    Cmnd_Alias SALT_GIT_HOOK = /bin/salt-call event.fire_master update salt/fileserver/gitfs/update
    Defaults!SALT_GIT_HOOK !requiretty
    ALL ALL=(root) NOPASSWD: SALT_GIT_HOOK
```
 2016-09-21 10:17:10 -06:00
twangboy
ec67a9bb2f Add cachedout's recommendations 2016-09-21 07:39:20 -06:00
twangboy
26a40dadbe Update docs for Windows 2016-09-20 17:19:40 -06:00
rallytime
7bcbf8dc36 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/faq.rst
  - salt/modules/win_service.py
 2016-09-20 10:43:55 -06:00
Rajvi Dhimar
bb439eacde Update carbon.rst 2016-09-19 14:33:12 -06:00
Oz N Tiram
ffdebf7a25 Fix a minor typo in docs 2016-09-19 14:30:34 -06:00
rallytime
c64e489f6f Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-19 11:22:54 -06:00
rallytime
2f9c4268f7 Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-19 11:21:55 -06:00
Jacob Hammons
9bc4eeb71e Fix typo (#36409) 2016-09-19 11:15:03 -06:00
Aditya Kulkarni
5737b1c409 Update versionadded and release notes (#36352) 2016-09-16 14:33:32 -06:00
rallytime
26cf545d03 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/utils/gitfs.py
  - tests/unit/modules/disk_test.py
 2016-09-16 10:35:49 -06:00
Joseph Hall
2a77316123 Update usage docs for Thorium (#36368) 2016-09-16 09:52:47 -06:00
Erik Johnson
b815c98577 Add note about yumpkg.check_db removal in Boron 
Resolves #36292.
 2016-09-15 15:30:07 -05:00
rallytime
95dbe1ade4 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/fileserver/__init__.py
  - setup.py
  - tests/integration/modules/git.py
 2016-09-14 09:15:29 -06:00
Mike Place
fc7a1d536f Merge pull request #36238 from pass-by-value/vmware_clone_from_snapshot 
Add ability to clone from a snapshot to salt-cloud vmware driver
 2016-09-14 14:31:50 +09:00
Mike Place
3833c9e095 Merge pull request #36247 from terminalmage/issue36150 
Add a runner function to clear fileserver list caches
 2016-09-13 09:17:05 +09:00
Erik Johnson
37c48472d6 Add documentation for fileserver_list_cache_time 2016-09-12 16:29:09 -05:00
Aditya Kulkarni
d96981639b Add ability to clone from a snapshot to salt-cloud vmware driver 2016-09-12 14:49:20 -04:00
rallytime
c3dcbb5906 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/dockerng.py
  - salt/utils/process.py
 2016-09-12 09:47:33 -06:00
Mike Place
1b12940a1f Docs clarification for module sync and state.apply (#36217) 
Closes #35340
 2016-09-12 08:42:12 -06:00
rallytime
6da0fbbe96 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/modules/linux_sysctl.py
  - tests/unit/cloud/clouds/dimensiondata_test.py
  - tests/unit/cloud/clouds/gce_test.py
  - tests/unit/modules/boto_iot_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/states/boto_iot_test.py
  - tests/unit/utils/network.py
 2016-09-08 16:14:04 -06:00
Nicole Thomas
3445a333d5 Remove unclosed backticks in walkthrough doc (#36170) 2016-09-08 15:49:01 -06:00
Jacob Hammons
ecb0979be7 Adds #36055 to release notes 2016-09-08 11:10:56 -06:00
Erik Johnson
a3442a88ed Update docs on run_run_plus 2016-09-03 14:59:04 -05:00
Nicole Thomas
95591c2fe6 Add documentation about salt_interface to EC2 docs (#36015) 
Fixes #35618
 2016-09-02 14:37:04 -06:00
Nicole Thomas
86e5edfd0a Add persist deprecation from win_useradd to Carbon release notes (#36001) 2016-09-01 11:53:25 -06:00
Mike Place
2e76f73ea1 Merge pull request #35918 from rallytime/fix-18614 
Remove the compact outputter
 2016-09-02 00:49:43 +09:00
C. R. Oldham
908234d9ab Document module whitelisting. Remove FIXME comments for disable_modules and disable_returners as they are definitely implemented. (#35717) 2016-09-01 09:40:36 -06:00
Mike Place
f115e6fc8f Merge pull request #35919 from rallytime/fix-35618 
Add documentation about salt_interface to EC2 docs
 2016-09-02 00:20:27 +09:00
rallytime
ae595537ff Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/pkgng.py
 2016-08-31 16:39:54 -06:00
Thomas S Hatch
5aaad9e42e Merge pull request #35714 from rallytime/file_module_deprecations 
Remove the file.grep Carbon warning for multiple command line args
 2016-08-31 14:53:13 -06:00
Jacob Hammons
3e21e35933 Version docs to 2015.8.12 2016-08-31 14:38:16 -06:00
Jacob Hammons
ac8fe6ff9e Version docs to 2016.3.3 2016-08-31 14:34:55 -06:00
Jacob Hammons
9910b9c6f9 Fix incremental doc builds - OS X, postgres returner, tcp transport doc updates (#35865) 
* Updates doc builds to generate build timestamp only when building for docs.saltstack.com. This re-enables incremental builds.
Adds notes to OS X page that Salt master on OS X is not officially supported
Adds note to postgres returners to cross-link modules with usage explanation (ZD #875)
Adds example showing how to enable tcp transport

* Generate copyright date
Footer updates
 2016-08-31 09:51:36 -06:00
rallytime
ef2871c357 Add documentation about salt_interface to EC2 docs 
Fixes #35618
 2016-08-30 15:23:50 -06:00
rallytime
eed0a9d23d Remove the compact outputter 
This outputter was originally introduced in the 2014.7 branch, but
quickly regressed and never worked in a released version of Salt. Since
then, its existence has caused much confusion. In addition, this
outputter actually was supposed to accomplish the same thing as setting
"state_verbose" to False. Therefore, it doesn't make sense to maintain
two outputters (this one and the highstate outputter).

Fixes #18614
 2016-08-30 14:16:59 -06:00
rallytime
bd157b8dbe Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/utils/cloud.py
 2016-08-30 12:03:06 -06:00
Mike Place
f7d8f408c2 Merge pull request #35822 from terminalmage/issue35045 
Fixes for top file merging
 2016-08-31 01:40:41 +09:00
rallytime
9e55bee5d5 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-30 10:17:53 -06:00
Loren Gordon
08e10f69eb Clarifies how to create aliased functions (#35891) 2016-08-30 10:04:58 -06:00
Erik Johnson
f2f4482fa0 Update top file merging docs to reflect new strategy 2016-08-30 08:58:18 -05:00
Mike Place
7f067bc4f8 Merge pull request #35879 from rallytime/doc-build-cleanup 
Clean up some of the warnings during a doc build
 2016-08-30 15:44:06 +09:00
Erik Johnson
a72fcf6aad Add versionadded for args event docs 2016-08-30 00:48:06 -05:00
Erik Johnson
c6cdb049fc Add documentation for runner events 2016-08-30 00:46:29 -05:00
rallytime
3d49f6a58d Add yaml.parser to doc build mocks 2016-08-29 16:41:15 -06:00
rallytime
4ebfde9337 Remove node refernce in execution module docs: doesn't exist. 2016-08-29 15:33:26 -06:00
rallytime
2320865e5c Remove references to logstash_http engine: should be http_logstash. 2016-08-29 14:59:06 -06:00
rallytime
82e9cb748f Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/client/mixins.py
  - salt/engines/sqs_events.py
  - salt/minion.py
 2016-08-29 12:48:43 -06:00
Nicole Thomas
96792663da Add engines to list of extension module options in master config docs (#35864) 
Fixes #35837
 2016-08-29 12:22:30 -06:00
rallytime
5f93d682aa Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/client/ssh/__init__.py
 2016-08-29 10:56:11 -06:00
Erik Johnson
c534d88280 More clarification/correction in minion docs 2016-08-27 15:18:06 -05:00
Erik Johnson
e9e6ea8485 One more tweak to top file merging docs 
This catches one more inaccuracy that wasn't fixed in
https://github.com/saltstack/salt/pull/35774
 2016-08-27 14:30:14 -05:00
rallytime
2b1ad9e9b9 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/utils/gitfs.py
 2016-08-26 14:54:54 -06:00
rallytime
e8e73b55ac Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/topics/jobs/schedule.rst
  - salt/states/user.py
 2016-08-26 13:21:12 -06:00
Todd Wells
e212c55b7a Schedule documentation update (#35745) 
* Scheduling jobs add state and module options

* Scheduling jobs doc formatting
 2016-08-26 10:47:04 -06:00
Jacob Hammons
0247867898 Adds mock for tornado.locks (#35807) 2016-08-26 10:43:34 -06:00
Nicole Thomas
0ee237a9cb Remove extra "to" in top.rst docs (#35808) 
Refs #35774
 2016-08-26 10:38:57 -06:00
Alexander Bauer
e4dfc21581 Trivial documentation spelling fix (#35800) 
Change `statnds` to `stands` in State Writing documentation.
 2016-08-26 10:30:08 -06:00
Erik Johnson
2fc61763d8 Correct the top_file_merging_strategy documentation (#35774) 
Top file merging does not work as described in the docs, this is being
corrected for the Carbon release. This commit fixes the docs so that
they A) are accurate for these older release branches, and B) refer to
the Carbon release as a point when top file merging was corrected.

These references to the Carbon release will need to be updated again
once we settle on a version number for Carbon.
 2016-08-26 10:25:56 -06:00
rallytime
6464236f68 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - doc/ref/returners/index.rst
  - salt/states/disk.py
 2016-08-25 16:09:01 -06:00
Nicole Thomas
6784cb036d Implement suggestions of bytes vs str type for #35593 (#35783) 
* Implement suggestions of bytes vs str type for #35593

Refs #35593

* Str, not bytes
 2016-08-25 15:45:51 -06:00
Mike Place
89bf5cf250 Developer documentation for Unicode handling (#35593) 
* Developer documentation for Unicode handling

* Clarifications
 2016-08-25 15:30:31 -06:00
Nicole Thomas
9b5ee2155e Merge pull request #35763 from isbm/isbm-doc-conf-sphinx-crashfix 
Sphinx crash: documentation config fix
 2016-08-25 15:12:38 -06:00
Nicole Thomas
cd90052187 Documentation spelling fixes (#35773) 
Fixes #35771
 2016-08-25 13:41:03 -06:00
Nicole Thomas
0546b76d63 Revert "Template context must be populated with key:value pairs" (#35770) 2016-08-25 11:31:04 -06:00
Bo Maryniuk
a56ae4e8f5 Configure importing Mock to handle 'total' method from psutils properly 2016-08-25 16:48:34 +02:00
Bo Maryniuk
9c057d0266 Return psutil back to the list of mocked imports 2016-08-25 16:47:59 +02:00
Bo Maryniuk
3d7758461e Improve Mock to be flexible and able to mock methods from the mocked modules 2016-08-25 16:47:08 +02:00
Jacob Hammons
2a12795bac Fixes Windows download paths (#35742) 2016-08-24 13:38:17 -06:00
rallytime
748b5956b4 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/engines/sqs_events.py
  - salt/utils/gitfs.py
 2016-08-24 09:50:40 -06:00
Mike Place
fdbf01d5ad Remove docs mocks for msgpack and psutils 
Also make docs build py3 compat
 2016-08-24 22:55:11 +09:00
Mike Place
bd0790f5f7 Merge pull request #35374 from cachedout/issue_34434 
Allow for additional module validation functions.
 2016-08-24 17:32:54 +09:00
Mike Place
a6eaa277c3 Merge pull request #35707 from rallytime/jobs_runner_deprecations 
Remove outputter kwarg from jobs runner. It has been deprecated.
 2016-08-24 16:41:10 +09:00
rallytime
6bd0f98062 Remove the file.grep Carbon warning for multiple command line args 2016-08-23 14:28:21 -06:00
rallytime
adc4e0fdfe Template context must be populated with key:value pairs 
This situation has been on deprecation warning for a while to allow
people time to update their state files. For the Carbon release, we
are switching the warnings over to raise SaltInvocationErrors.
 2016-08-23 14:07:39 -06:00
rallytime
caa113d390 Remove outputter kwarg from jobs runner. It has been deprecated. 2016-08-23 13:32:59 -06:00
rallytime
b80ef26cf2 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/cli/batch.py
  - salt/minion.py
  - salt/modules/cassandra_cql.py
  - salt/modules/rsync.py
 2016-08-23 10:44:55 -06:00
Mike Place
b3f2410fe9 Docs 2016-08-23 18:12:09 +09:00
rallytime
1d819d7cc2 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-22 09:29:13 -06:00
Nicole Thomas
92ecbc3b26 Remove deprecated version of status.uptime module function (#35535) 
* Remove the deprecated version of the status.uptime function.

The deprecated version of the function was set to be removed in
Carbon. The Carbon release notes were also updated with this change.

* Remove test_deprecated_uptime unit test

The deprecated version of uptime no longer exists.

* Remove unused import and deprecated uptime reference
 2016-08-22 09:25:21 -06:00
Mike Place
45a12ccaf0 Add Nitrogen release notes and remove deprecation warning for core grains 
We can't have a deprecation warning thrown for grains on every single salt-call.
That's just too much. Documenting in the release notes will be fine.
 2016-08-22 11:52:01 +09:00
Mike Place
2876e67ac4 Merge pull request #35530 from rallytime/remove_add_proxymodule_to_opts 
Remove add_proxymodule_to_opts from minion.py in Carbon
 2016-08-20 11:33:40 +09:00
Mike Place
05ea6b7083 Merge pull request #35532 from rallytime/remove_parse_args_and_kwargs 
Remove the parse_args_and_kwargs function from minion.py
 2016-08-20 11:32:31 +09:00
Brian Glogower
2801f0fdcc Remove duplicate auth_tries in minion docs 2016-08-19 17:46:26 -07:00
Nicole Thomas
399e9f57cc Update release notes for 2015.8.12 (#35614) 2016-08-19 16:13:08 -06:00
Nicole Thomas
f7f8221169 Everything in the sample master config file should be commented out (#35611) 2016-08-19 16:05:40 -06:00
rallytime
f2eb625778 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-19 11:13:15 -06:00
Nicole Thomas
21c9c2d025 Make sure version label is correct in header (#35603) 2016-08-19 10:29:58 -06:00
Nicole Thomas
83425274f5 Update release notes for 2016.3.3 (#35602) 2016-08-19 10:27:34 -06:00
Nicole Thomas
0c7aa802f5 Update release notes for 2015.8.12 (#35600) 2016-08-19 10:13:41 -06:00
Nicole Thomas
dd12b48239 Update release notes for 2015.8.12 (#35599) 2016-08-19 09:59:31 -06:00
Erik Johnson
fd08d33597 Add warning about AWS flagging of nmap usage (#35575) 
* Add warning about AWS flagging of nmap usage

Also improve the verification examples overall, and add a note about the
fingerprint display difference beginning in OpenSSH 6.8.

* Remove "as root"

For some reason, when I was running the test in the example, I wasn't
getting the script output for the host key, unless I ran as root. Don't
know why this was the case but I can't reproduce it now. Removing this
as it is not accurate.

Also added a port number to the example as well since it speeds up the
nmap command.
 2016-08-18 17:00:02 -06:00
Mike Place
9279d6b6eb Merge pull request #35496 from StackPointCloud/profitbricks-cloud-improvements 
ProfitBricks cloud provider features and improvements
 2016-08-18 09:39:02 +09:00
rallytime
c2cc4f13a3 Remove the parse_args_and_kwargs function from minion.py 
It is deprecated and marked for removal in Carbon.
 2016-08-17 12:41:23 -06:00
rallytime
376976a19b Remove add_proxymodule_to_opts from minion.py in Carbon 
Also remove relevant documentation references - these config settings
are no longer needed.
 2016-08-17 12:22:25 -06:00
Mike Place
b3b28cb760 Might be a good idea to be able to download the software we make (#35513) 
Docs are a thing.
 2016-08-17 09:47:49 -06:00
Mike Place
a7fb5aa09d Merge pull request #35466 from rallytime/pip-deprecations 
Remove the env and activate kwargs from pip install/ed functions
 2016-08-17 19:41:37 +09:00
Mike Place
69b44bc6f8 Merge pull request #35500 from rallytime/fix-35068 
Add docs for pillar_raise_on_missing option
 2016-08-17 18:15:29 +09:00
rallytime
cface344d6 Add docs for pillar_raise_on_missing option 
Fixes #35068
 2016-08-16 14:57:58 -06:00
Ethan Devenport
de42b0135c Added new features and improvements to the ProfitBricks provider including: 
* Refactored LAN and NIC provisioning to use a more efficient composite server request.
* Added support for new INTEL_XEON and AMD_OPTERON CPU family types.
* Allow additional data volumes can be created and attached to servers.
* Added public and private network firewall rules.
* Added preliminary support for loadbalancers CLI functions.
* Corrected ProfitBricks name topic index.
* Updated ProfitBricks provider documentation.
* Updated provider integration test configs.
* PEP8 clean up.
 2016-08-16 20:07:42 +00:00
rallytime
45e1424ba3 Remove the env and activate kwargs from pip install/ed functions 
These options have been marked for deprecation in Carbon. The bin_env
option replaces both of these keyword agrs in the pip execution module
as well as the pip state.
 2016-08-16 11:06:20 -06:00
Mike Place
e3858d8f80 Merge pull request #35400 from thatch45/snapper_states 
Introduce rollback to Salt States
 2016-08-16 12:04:39 +09:00
Mike Place
c7564d997a Merge pull request #35464 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-16 10:26:54 +09:00
Mike Place
330be069c6 Merge pull request #35468 from thatch45/doc-salt-cp 
Add some more notes to the salt-cp doc
 2016-08-16 10:24:56 +09:00
rallytime
d17fbe96de LXC execution module Carbon deprecations 2016-08-15 16:28:23 -06:00
Thomas S Hatch
4cc2add938 Add soem more notes to the salt-cp doc 2016-08-15 15:59:41 -06:00
rallytime
48cc3bdfaa Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/dockerng.py
  - tests/unit/modules/dockerng_test.py
 2016-08-15 13:27:52 -06:00
rallytime
6a86a12294 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/cp.py
 2016-08-15 11:23:44 -06:00
Mike Place
09925ba353 Minor doc fixup (#35436) 
* Minor doc fixup

Refs #35387

* Include reload_grains
 2016-08-15 09:53:56 -06:00
rallytime
1fe0b69a6c Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/blockdev.py
  - salt/modules/ddns.py
  - salt/modules/inspectlib/collector.py
  - salt/modules/linux_sysctl.py
  - salt/modules/status.py
  - salt/modules/x509.py
  - salt/utils/process.py
  - salt/utils/verify.py
  - tests/integration/__init__.py
  - tests/integration/modules/state.py
  - tests/integration/states/cmd.py
 2016-08-12 16:21:58 -06:00
Thomas S Hatch
89a0f0ddc4 Add to release notes, snapper! 2016-08-11 16:00:25 -06:00
Thomas S Hatch
63a4a36454 Add config docs 2016-08-11 15:52:44 -06:00
rallytime
cf038ee3fe Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/file.py
  - salt/modules/hosts.py
  - salt/modules/inspectlib/collector.py
  - salt/modules/portage_config.py
  - salt/modules/x509.py
  - salt/scripts.py
  - tests/integration/shell/enabled.py
 2016-08-11 11:33:54 -06:00
Nicole Thomas
d9c20c0456 Update freebsd.rst (#35394) 
Updated FreeBSD installation instructions to remove ``priority`` definition. 
(This, I believe, should address an issue submitted in saltstack/salt-bootstrap/issues/908)
 2016-08-11 11:00:36 -06:00
Mike Place
dfac0dec9f Merge pull request #35368 from rallytime/file-module-deprecations 
Remove contains_regex_multiline function from file module
 2016-08-11 09:36:02 +09:00
Mike Place
354da71209 Merge pull request #35361 from rallytime/blockdev-deprecations 
Blockdev deprecations
 2016-08-11 09:35:04 +09:00
rallytime
102fcbe916 Remove contains_regex_multiline function from file module 2016-08-10 16:43:49 -06:00
rallytime
8083c97786 Remove the vsphere.rst docs for Carbon 
Forgot to remove this file when removing the vsphere cloud driver
in #35248.
 2016-08-10 16:16:29 -06:00
Justin Findlay
66332510c6 doc.ref.configuration.logging: document log levels 2016-08-10 14:10:43 -06:00
Justin Findlay
93616eff3e doc.ref.configuration.logging: fix formatting 2016-08-10 10:47:07 -06:00
Justin Findlay
472a2d31de doc.ref.configuration.logging: cleanup formatting 2016-08-10 10:46:39 -06:00
rallytime
96bc36ca2e Remove deprecated functions from blockdev module 2016-08-10 10:37:14 -06:00
Mike Place
2c6f785bfa Merge pull request #35283 from twangboy/windows_build_scripts 
Add Salt-Master to Installer for Windows
 2016-08-10 20:46:42 +09:00
Mike Place
0167db1448 Merge pull request #35317 from rallytime/fileserver-runner-deprecations 
Remove deprecated outputter kwarg from fileserver runner
 2016-08-10 20:36:11 +09:00
rallytime
3d5c160b5d Use Carbon instead of Boron for new develop functions/args/kwargs 2016-08-09 16:07:39 -06:00
rallytime
6dcea4f705 Remove deprecated outputter kwarg from fileserver runner 2016-08-09 15:16:20 -06:00
Nicole Thomas
904324d7b3 Reorganize deprecation docs into sections in Carbon release notes (#35307) 
This makes all of the deprecations more readable and easier to find
things that have been deprecated in the Carbon release.
 2016-08-09 13:20:12 -06:00
twangboy
098a6bc538 Fix typos in documentation 2016-08-09 17:27:45 +00:00
twangboy
0a5d804a40 Update documentation for new installer 2016-08-09 17:23:48 +00:00
rallytime
14454eab72 Add cloud deprecations to release notes 
And give cloud deprecations their own section to make things
easy to spot.
 2016-08-08 19:47:56 -06:00
rallytime
8f2058219e Remove private_ip option in linode driver 
This option has been deprecated - use assign_private_ip instead.
 2016-08-08 19:25:18 -06:00
Mike Place
715dc14b9b Merge pull request #35247 from rallytime/carbon-deprecations 
Remove some of the things that are deprecated in Carbon
 2016-08-09 09:00:27 +09:00
rallytime
de4b33f2e1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/client/ssh/shell.py
  - salt/config/__init__.py
  - salt/grains/core.py
  - salt/utils/gitfs.py
 2016-08-08 12:34:23 -06:00
rallytime
2b4c156df1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/grains/core.py
  - salt/output/highstate.py
 2016-08-08 11:15:43 -06:00
Thomas S Hatch
f8158124d5 Merge pull request #35211 from cachedout/issue_31074 
Alternative sudo users for salt-ssh
 2016-08-08 09:40:55 -06:00
Mike Place
f004b831d2 Merge pull request #35178 from cro/proxy_cache_fix2 
Add append_minionid_config_dirs option
 2016-08-07 07:21:14 +09:00
Mike Place
104116f464 Add release notes and include entry about disk.wipe fix 2016-08-07 06:58:55 +09:00
rallytime
9216e8ad93 Remove deprecated vsphere cloud driver in Carbon release 
This driver has been marked for deprecation and removal in Carbon.
Release notes were updated accordingly.

Users will need to use the vmware cloud driver instead.
 2016-08-05 16:16:12 -06:00
rallytime
51d22112d7 Docs cleanup 2016-08-05 16:02:37 -06:00
rallytime
4d6b214380 Remove deprecated zpool_list function in zpool module 2016-08-05 15:47:52 -06:00
rallytime
a0dd435304 Remove carbon deprecations from the virt runner 
Several functions were removed as well as any references to the "hyper"
kwarg. "host" should be used instead.

Release notes were also updated with this information.
 2016-08-05 15:08:43 -06:00
rallytime
8f76d92b72 Remove use of always kwarg in pgkbuild.built state: deprecated 
This has been deprecated and marked for removal in Carbon. Also added
a note to the release notes about this change. Use 'force' instead.
 2016-08-05 14:48:54 -06:00
rallytime
c99c7969c3 Remove deprecated created, started, and cloned functions from lxc state 
Also updates the Carbon release notes to include these removals and
includes which functions replace the deprecated functions
 2016-08-05 14:26:46 -06:00
rallytime
5dad736f3c Add hash_hostname, iam utils funcs, and ip_in_subnet deprecations to Carbon release notes 2016-08-05 13:07:18 -06:00
Nathan Gould
3683f9a715 Improve clarity of requisite docs 
Docs should stick to the terms "required" vs. "dependent", where required means the state that has to happen first, and dependent means the state that relies on the required state.
 2016-08-04 15:14:39 -04:00
Mike Place
6f53232e6d Better error handling and a workaround for group mismatch. 2016-08-05 03:41:36 +09:00
Mike Place
5b56a4acf7 Docs 2016-08-05 03:24:18 +09:00
Jonathan Ballet
1642dba5d1 doc: fix broken links in the test documentation page 2016-08-04 16:56:42 +02:00
Thomas S Hatch
da6107647d Add some release notes on features for carbon (#35188) 
* Add initial relnotes for ceph, docker and thorium stuff

* more
 2016-08-03 17:01:41 -06:00
rallytime
df5f3d45a1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/minion.py
 2016-08-03 15:06:17 -06:00
C. R. Oldham
84cc7d67c0 Add documentation for append_minionid_config_dirs. 2016-08-03 12:36:37 -06:00
rallytime
a64026fc99 Start release notes for 2016.3.3 2016-08-02 15:47:17 -06:00
Jacob Hammons
f4d869fb0f doc version updated to 2016.3.2 (#35147) 
updated the navigation headings
 2016-08-02 14:21:52 -06:00
Jacob Hammons
4967ed275f doc version update to 2015.8.11, updates to release notes (#35145) 2016-08-02 13:55:32 -06:00
rallytime
72a116b731 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/pkg.py
 2016-08-02 13:05:36 -06:00
Mike Place
222449cd0e Merge pull request #34920 from cachedout/key_cache 
Key cache
 2016-08-02 12:11:18 -06:00
rallytime
0d5f0b6016 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-02 10:40:26 -06:00
Mircea Ulinic
2d2407f036
http_logstash engine 2016-08-02 12:11:04 +00:00
Mike Place
b91bccaae5 Merge pull request #35086 from ankitforcode/Adding_digital_ocean_ssh_interface_feature 
Adding Digital Ocean ssh_interface feature
 2016-08-02 01:54:01 -06:00
Erik Johnson
d54d14c6cf Add documentation for runner_returns config option 2016-08-01 23:04:05 -05:00
Thomas S Hatch
307d5a17b2 Branding, it matters 2016-08-01 16:01:14 -06:00
Thomas S Hatch
9c1bb5c3ff Merge pull request #35062 from thatch45/develop 
Initial Docker sls tutorial
 2016-08-01 15:57:39 -06:00
Thomas S Hatch
d3a5e13ef3 like this you think? 2016-08-01 15:55:46 -06:00
Thomas S Hatch
c7ea94ea01 it is no secret, I don't spell too well :) 2016-08-01 15:06:40 -06:00
Thomas S Hatch
64d6282135 SUSE, not Suse, not SuSE 2016-08-01 15:00:37 -06:00
Thomas S Hatch
b37e81a6cf clarify on image used 2016-08-01 14:44:32 -06:00
Thomas S Hatch
823dc8d586 fix typo 2016-08-01 14:23:07 -06:00
rallytime
a2fbbebe86 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/master.py
  - salt/modules/saltutil.py
  - salt/states/saltmod.py
 2016-08-01 13:42:36 -06:00
rallytime
fbaff3e98e Update 2016.3.0 release notes with repo.saltstack.com Xenial pkg availability 
Refs #33870
 2016-08-01 11:14:53 -06:00
Mike Place
9bf9edb0e0 Merge pull request #35071 from terminalmage/issue35065 
Detect nodegroup lists with no compound syntax as L@host1,host2,host3...
 2016-08-01 06:52:40 -06:00
Ankit Agarwal
3b668158c6 Adding feature ssh_interface for Digital Ocean Cloud Config 2016-07-31 23:32:04 +05:30
Duncan Mac-Vicar P
9bfb3d85f1 add links to (open)SUSE family of images and build generation tools 2016-07-31 10:37:18 +02:00
Erik Johnson
723b536eae Add documentation, release notes mention for new feature 2016-07-29 19:28:52 -05:00
Thomas S Hatch
82228b47d9 Initial Docker sls tutorial 2016-07-29 10:32:10 -06:00
Mike Place
bd5e2a3ed3 Merge pull request #35033 from UtahDave/fix_win_cpu_model 
Fix cpu_model grain on Windows to actual CPU model
 2016-07-29 10:06:25 -06:00
Mike Place
4fe3397a41 Merge pull request #34921 from tonybaloney/quickstart 
Introduce a template system for extending SaltStack open
 2016-07-28 22:38:10 -06:00
rallytime
bdcc81a384 Start release notes file for 2015.8.12 2016-07-28 17:16:49 -06:00
David Boucha
2fe747c05c add release note about the cpu_model grain change 2016-07-28 15:35:55 -06:00
Mike Place
404833e51b Merge pull request #34969 from fdamstra/Add_multi_event_return 
Adds support for multiple server-side event_returners.
 2016-07-28 13:39:52 -06:00
rallytime
fde7e0f4c5 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/utils/schedule.py
 2016-07-28 11:08:14 -06:00
Anthony Shaw
5b2a97e22b
added docs 2016-07-28 11:33:42 +10:00
Anthony Shaw
1280940079
linting fixes 2016-07-28 09:13:22 +10:00
Mike Place
92e69310c9 Merge pull request #34993 from terminalmage/docs 
Add docs on utility modules, improve module writing docs, update Carbon release notes
 2016-07-27 13:12:30 -06:00
Mike Place
1534b143e2 Merge pull request #34772 from kerick/ddns-port-work 
ddns: Add support for user defined nameserver port/TSIG key algorithm
 2016-07-27 12:05:40 -06:00
Erik Johnson
82ebfc6b31 Improve Carbon release docs 2016-07-27 12:15:28 -05:00
Erik Johnson
6ae5667c23 Clarify usage of module.run state in states documentation 2016-07-27 11:57:55 -05:00
Erik Johnson
a5c78d626e Improve accuracy and formatting of execution module docs 2016-07-27 11:57:12 -05:00
Erik Johnson
4538b9e9d4 Add utility modules doc page to the TOC 2016-07-27 11:56:49 -05:00
Erik Johnson
4e804217e3 Add documentation on utility modules 2016-07-27 11:56:41 -05:00
rallytime
a2aae987a6 Update release notes with new changes 2016-07-27 09:53:19 -06:00
Fred Damstra
8b56d76490 Adds support for multiple server-side event_returners. 
The master config 'event_return' can now take a list
of returners which will each be called in turn. It
continues to function with the previous configuration
format of a single item.
 2016-07-27 11:41:59 -04:00
Anthony Shaw
dac5cec503
start doc layout 2016-07-27 19:56:35 +10:00
Mike Place
9cd052f07f Merge pull request #34959 from terminalmage/utils-in-runners 
Make __utils__ dunder available in runner funcs
 2016-07-26 16:13:35 -06:00
Erik Johnson
7b22b6b0e6 Add new runner feature to Carbon release notes 2016-07-26 12:29:59 -05:00
rallytime
76e8dd974a Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/state.py
  - tests/integration/__init__.py
  - tests/integration/wheel/key.py
 2016-07-26 11:05:24 -06:00
Denys Havrysh
0faa490991 Fix job scheduling using `when parameter (by python-dateutil`) 2016-07-26 17:37:28 +03:00
Mike Place
1ca13c006a Add note in scaling doc 2016-07-24 11:54:21 -06:00
Mike Place
caf0361bc1 Merge pull request #34807 from terminalmage/issue2707 
Feature addition: preserve mode in file states
 2016-07-22 16:43:31 -06:00
rallytime
9227c3dd26 Merge branch '2015.8' into '2016.3' 
Conflicts:
  -   -   -   -   -   -   -   -   - conf/master
 2016-07-21 13:39:21 -06:00
rallytime
1a9d6eee15 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/grains/core.py
  - salt/state.py
  - tests/unit/grains/core_test.py
 2016-07-21 12:06:25 -06:00
Nicole Thomas
7423177491 Update 2016.3.2 release notes (#34850) 2016-07-21 11:18:31 -06:00
Thomas S Hatch
94df6f8dc6 Add a clarifying note on Saltfile 2016-07-21 11:09:28 -06:00
Nicole Thomas
59fffa86bc Update release notes for 2016.3.2 (#34848) 2016-07-21 10:02:01 -06:00
Thomas S Hatch
6c35d88268 Fix #34648 (#34828) 2016-07-20 14:49:52 -06:00
Erik Johnson
087500bde7 Add new file mode preservation feature to carbon release notes 2016-07-20 15:33:11 -05:00
Jayson Cofell
9c330fe492 Fix port arguments 2016-07-20 06:29:56 -05:00
Jayson Cofell
7756d7af5e Modify port argument position/documentation 2016-07-19 13:28:12 -05:00
rallytime
39bc093ee9 Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-07-19 10:31:07 -06:00
C. R. Oldham
bf4dc079df Document fqdn_base. 2016-07-18 15:49:59 -06:00
Jacob Hammons
c3ae64c054 Updates man pages (#34756) 
adds link to all tutorials to using salt section
Refs #33923
 2016-07-18 15:36:50 -06:00
Jayson Cofell
fc6409b69a Update ddns runner documention for port, TSIG key algorithm, and timeout 2016-07-18 15:18:55 -05:00