saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '51825_scheduled_global_enabled' of github.com:garethgreenaway/salt into 51825_scheduled_global_enabled

Browse source
This commit is contained in:
Gareth J. Greenaway 2019-03-01 11:38:45 -08:00
commit 301e773cd2
No known key found for this signature in database
GPG key ID: 10B62F8A7CAD7A41
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
doc/topics/releases/2019.2.0.rst
View file

@ -487,6 +487,18 @@ module.
proxytype: docker
name: keen_proskuriakova
Terraform Salt-SSH Roster
=========================
You can now dynamically generate a Salt-SSH roster from the terraform resources
defined with `terraform-provider-salt <https://github.com/dmacvicar/terraform-provider-salt>`_.
This allows you to combine both terraform and Salt-SSH to provision and
configure your hosts. See the :py:mod:`terraform roster<salt.roster.terraform>` for
an example on how to setup and use.
Grains Dictionary Passed into Custom Grains
===========================================

8
salt/modules/win_pkg.py
View file

@ -838,7 +838,7 @@ def refresh_db(**kwargs):
The database is stored in a serialized format located by default at the
following location:
`C:\salt\var\cache\salt\minion\files\base\win\repo-ng\winrepo.p`
``C:\salt\var\cache\salt\minion\files\base\win\repo-ng\winrepo.p``
This module performs the following steps to generate the software metadata
database:
@ -846,7 +846,7 @@ def refresh_db(**kwargs):
- Fetch the package definition files (.sls) from `winrepo_source_dir`
(default `salt://win/repo-ng`) and cache them in
`<cachedir>\files\<saltenv>\<winrepo_source_dir>`
(default: `C:\salt\var\cache\salt\minion\files\base\win\repo-ng`)
(default: ``C:\salt\var\cache\salt\minion\files\base\win\repo-ng``)
- Call :py:func:`pkg.genrepo <salt.modules.win_pkg.genrepo>` to parse the
package definition files and generate the repository metadata database
file (`winrepo.p`)
@ -1042,7 +1042,7 @@ def _get_repo_details(saltenv):
def genrepo(**kwargs):
'''
Generate package metedata db based on files within the winrepo_source_dir
Generate package metadata db based on files within the winrepo_source_dir
Kwargs:
@ -2087,7 +2087,7 @@ def purge(name=None, pkgs=None, **kwargs):
def get_repo_data(saltenv='base'):
'''
Returns the existing package meteadata db. Will create it, if it does not
Returns the existing package metadata db. Will create it, if it does not
exist, however will not refresh it.
Args: