valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
77,166 Commits 24 Branches 182 Tags 341 MiB
682e81b423
Commit Graph

6764 Commits

Author SHA1 Message Date
Mike Place
993596b10a Merge pull request #38218 from rallytime/cmd-run-alias-deprecation 
Remove support for aliasing cmd.run to cmd.shell
 2017-01-06 14:36:18 -07:00
Mike Place
791499c813 Merge pull request #38620 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-01-06 10:50:58 -07:00
Mike Place
e2c8f7a844 Merge pull request #38588 from cloudflare/STATUSPAGE-MOD 
New execution module: statuspage
 2017-01-06 10:29:13 -07:00
rallytime
87af1f1e5a Remove support for aliasing cmd.run to cmd.shell 2017-01-06 11:46:47 -05:00
rallytime
342a5ac0b8 Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-01-06 10:31:51 -05:00
Mike Place
6646a95c1e Merge pull request #38490 from eradman/cloud_config 
Change map and profile extends merge strategy to use recursive update
 2017-01-05 16:35:41 -07:00
Mircea Ulinic
515c6643c9
StatusPage module doc 2017-01-05 18:02:13 +00:00
rallytime
30f14d15df Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/config/__init__.py
  - salt/engines/slack.py
 2017-01-04 16:54:58 -05:00
Mike Place
7b74436d13 Merge pull request #38562 from rallytime/arch-install-docs 
Update arch installation docs with correct package name
 2017-01-04 13:04:27 -07:00
Mike Place
4723d26105 Merge pull request #38564 from rdutch/update_orchestration_docs 
Update orchestration docs with runner explanation.
 2017-01-04 12:56:34 -07:00
Eric Radman
3ec910cf34 Change map and profile extends merge strategy to use recursive update 
Previously only top-level data elements could be overridden in a map or
extended profile entry. This change adjusts map and profile evaluation
to use a recursive merge using salt.utils.dictupdate.update().

This is a break with compatibility, but in the common case a cloud
profile or map is not structured to truncate configuration but to add
further detail to the profile that it extends.

Update map docs with an example from VMware where we chan now change a
network parameter without having to repeat other device information such
as disk controllers.
 2017-01-04 14:11:53 -05:00
Mike Place
b1e21ed58d Merge pull request #38516 from Inveracity/patch-2 
include option for freeipa
 2017-01-04 11:54:59 -07:00
Hilberding, Rob
f83cc2993c Update orchestration docs with runner explanation. 2017-01-04 13:34:55 -05:00
rallytime
8b1897ace9 Update arch installation docs with correct package name 
When 2016.11.0 was released, the naming of the salt package was
changed. The salt-zmq version is now named just "salt" and the
salt-raet pacakge is no longer being updated.
 2017-01-04 13:08:47 -05:00
David Boucha
4ddbc2ecaa add note about pyVmomi locale workaround (#38536) 2017-01-04 09:24:04 -05:00
rallytime
9ad362fbde Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/states/kapacitor.py
 2017-01-03 10:17:18 -05:00
Inveracity
f1c6fc30d1 include option for freeipa 
Updating docs to include freeipa per merge request #37219
 2017-01-02 14:15:42 +01:00
twangboy
e96bfe8fa2 Change OSX/OS X to macOS where possible 2016-12-28 14:49:46 -07:00
Dirk Heinrichs
362448789c Fix documentation reg. pkg.available_version. 2016-12-27 19:15:55 +01:00
Mike Place
acedf3e95b Merge pull request #38413 from eradman/map_docs 
Provide an example for overriding nested parameters in a map file
 2016-12-27 09:24:17 -07:00
Mike Place
34621930aa Merge pull request #38420 from rallytime/module-deprecations 
Removed various deprecation notices from salt/modules/* files
 2016-12-27 09:09:58 -07:00
Erik Johnson
4cbfa9d947 Add pillarenv_from_saltenv to pillar docs 2016-12-22 16:25:29 -06:00
rallytime
a2927226ea Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/modules/all/salt.modules.napalm_route.rst
  - doc/ref/modules/all/salt.modules.napalm_snmp.rst
  - doc/ref/modules/all/salt.modules.napalm_users.rst
  - doc/ref/states/all/salt.states.netsnmp.rst
  - doc/ref/states/all/salt.states.netusers.rst
  - salt/states/cron.py
 2016-12-22 12:15:06 -07:00
rallytime
0a27f941f7 Removed various deprecation notices from salt/modules/* files 
Added docs to the release notes for all of these changes.

The affected modules are:

- htpasswd
- img
- smartos_virt
- virt
- virtualenc_mod
- xapi
- zypper
 2016-12-22 11:57:26 -07:00
rallytime
efb8a8ddf5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/config/__init__.py
  - salt/minion.py
 2016-12-22 10:39:14 -07:00
Erik Johnson
27253522c8 Improve pillar documentation (#38407) 
* rename anchor

* Move pillar cache config option to different section, add an anchor

* Add links to master and minion config items

* Add documentation for pillar.item's "delimiter" argument

* Improve pillar documentation

This improves RST formatting, adding hyperlinks as well as adding
information on the difference between in-minion pillar data and
pillar data that is compiled on-demand.

* Add section on how pillar environments are handled
 2016-12-22 10:32:37 -07:00
Mike Place
16f35244f8 Merge pull request #38378 from rallytime/git-deprecations 
Remove functions and arguments in git state and execution module
 2016-12-22 09:47:10 -07:00
Mike Place
d10e3ece5a Merge pull request #38404 from terminalmage/pillarenv 
Add config option to pin pillarenv to effective saltenv
 2016-12-22 09:34:19 -07:00
Eric Radman
d0507375b9 Provide an example for overriding nested parameters in a map 
At first reading it appears that that any data element can be specified
individually in a map, but this is not the case. Under the hood, the map file is
merged with the profile configuration using dict.update().

Employ the term 'top level data element' from
https://github.com/saltstack/salt/issues/23416
 2016-12-22 10:22:22 -05:00
Erik Johnson
4049bf7288 Add pillarenv_from_saltenv to Nitrogen release notes 2016-12-21 19:54:48 -06:00
Erik Johnson
1fd9c716d9 Add pillarenv_from_saltenv minion config parameter 2016-12-21 19:49:32 -06:00
Mike Place
4d05dc5337 Merge pull request #38396 from gtmanfred/develop 
add travisci module
 2016-12-21 14:01:37 -07:00
rallytime
09a76a0a97 Remove functions and arguments in git state and execution module 
These were all marked for removal in Nitrogen
 2016-12-21 11:55:18 -07:00
Daniel Wallace
05574d4770 add travisci module 
Used to verify webhook post requests came from travis
 2016-12-21 12:42:09 -06:00
Mike Place
a21354dff1 Merge pull request #38379 from rallytime/event-utils-deprecations 
Remove use_pending and pending_tags from salt.utils.event.get_event function
 2016-12-21 11:26:48 -07:00
Mike Place
5b6e31d6fc Merge pull request #38380 from rallytime/glusterfs-deprecations 
Remove deprecated functions from glusterfs state and module
 2016-12-21 11:25:47 -07:00
Seth House
cad64a9264 Remove retrieving roles from nodegroups from docs as anti-pattern 2016-12-20 22:43:56 -07:00
rallytime
7ecd4e6e1b Remove deprecated functions from glusterfs state and module 2016-12-20 15:09:54 -07:00
rallytime
efc5378f3d Remove use_pending and pending_tags from salt.utils.event.get_event function 2016-12-20 15:01:40 -07:00
Mike Place
a9c2618c89 Merge pull request #38360 from rallytime/deprecate-apache-states 
Remove enable/disable funcs from apache_* states
 2016-12-20 13:37:14 -07:00
Mike Place
68430b1fa6 Merge pull request #38348 from rallytime/mod-docs-2016.11 
Update autodoc topics for new modules added in 2016.11
 2016-12-20 13:36:20 -07:00
rallytime
b31c2412ca Add __iter__ and next options to doc/conf.py 
This allows sphinx to build without autodoc errors on mock objects
that should be iterable.

Also added versionadded tags to the snapper module and state.
 2016-12-20 11:50:43 -07:00
rallytime
494a06bee2 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-12-20 10:03:44 -07:00
Dmitry Kuzmenko
dad748f57a Data cache plugin configuration documentation. 2016-12-20 19:32:48 +03:00
Mike Place
662d8d64a8 Merge pull request #38166 from rallytime/cloud-deprecations 
Remove support for "provider" in cloud provider configs
 2016-12-20 08:06:19 -07:00
Mike Place
9cd7b72442 Merge pull request #38359 from rallytime/remove-PidfileMixin 
Remove PidfileMixin as it is deprecated for removal in Nitrogen
 2016-12-20 06:48:20 -07:00
Mike Place
9350808fea Merge pull request #38361 from rallytime/deprecate-client_acl-client_acl_blacklist 
Remove support for client_acl and client_acl_blacklist
 2016-12-20 06:33:23 -07:00
rallytime
a9f85f0dbe Remove support for client_acl and client_acl_blacklist 
These have been deprecated for some time and were marked for
removal in Nitrogen.

publisher_acl and publisher_acl_blacklist should be used instead.
 2016-12-19 16:18:48 -07:00
rallytime
baf8f208eb Remove dup LXC doc reference 2016-12-19 15:49:37 -07:00
rallytime
810ed4a9cd Remove enable/disable funcs from apache_* states 
The apache_*.enable and apache_*.disable state functions are
deprecated in favor of apache_*.enabled and apache_*.disabled.
 2016-12-19 15:42:39 -07:00