Merge branch '2019.2' into 51825_scheduled_global_enabled

This commit is contained in:
Gareth J. Greenaway 2019-02-28 08:31:31 -08:00 committed by GitHub
commit ae7ab061e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

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
===========================================