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

Porting PR #50904 to 2019.2.1

Browse source
This commit is contained in:
Gareth J. Greenaway 2019-09-18 17:38:42 -07:00
parent 8d4d5eaeb2
commit 4bd31d59cc
No known key found for this signature in database
GPG key ID: 10B62F8A7CAD7A41
4 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/topics/proxyminion/beacon.rst
View file

@ -22,15 +22,13 @@ configuring and managing multiple ``salt-proxy`` processes.
- p8000
This says that Salt's pillar should load some values for the proxy ``p8000``
from the file /srv/pillar/p8000.sls (if you have not changed your default pillar_roots)
from the file ``/srv/pillar/p8000.sls`` (if you have not changed your default pillar_roots)
2. In the pillar root for your base environment, create this file:
2. In the pillar root for your base environment, create the ``p8000.sls`` file with the
following contents:
.. code-block:: yaml
p8000.sls
---------
proxy:
# set proxytype for your proxymodule
proxytype: ssh_sample

8
doc/topics/proxyminion/demo.rst
View file

@ -58,16 +58,14 @@ Now, configure your salt-proxy.
This says that Salt's pillar should load some values for the proxy ``p8000``
from the file /srv/pillar/p8000.sls (if you have not changed your default pillar_roots)
from the file ``/srv/pillar/p8000.sls`` (if you have not changed your default pillar_roots)
3. In the pillar root for your base environment, create this file:
3. In the pillar root for your base environment, create the ``p8000.sls`` file with the
following contents:
.. code-block:: yaml
p8000.sls
---------
proxy:
proxytype: rest_sample
url: http://<IP your REST listens on>:port

8
doc/topics/proxyminion/ssh.rst
View file

@ -35,16 +35,14 @@ Now, configure your salt-proxy.
This says that Salt's pillar should load some values for the proxy ``p8000``
from the file /srv/pillar/p8000.sls (if you have not changed your default pillar_roots)
from the file ``/srv/pillar/p8000.sls`` (if you have not changed your default pillar_roots)
3. In the pillar root for your base environment, create this file:
3. In the pillar root for your base environment, create the ``p8000.sls`` file with the
following contents:
.. code-block:: yaml
p8000.sls
---------
proxy:
proxytype: ssh_sample
host: saltyVM

8
doc/topics/proxyminion/state.rst
View file

@ -23,15 +23,13 @@ on the remote end.
- p8000
This says that Salt's pillar should load some values for the proxy ``p8000``
from the file /srv/pillar/p8000.sls (if you have not changed your default pillar_roots)
from the file ``/srv/pillar/p8000.sls`` (if you have not changed your default pillar_roots)
2. In the pillar root for your base environment, create this file:
2. In the pillar root for your base environment, create the ``p8000.sls`` file with the
following contents:
.. code-block:: yaml
p8000.sls
---------
proxy:
# set proxytype for your proxymodule
proxytype: ssh_sample