| commit | c63f4b1c162c4f4d3d8f43373f1659476f09c6cb | [log] [tgz] |
|---|---|---|
| author | Ales Komarek <akomarek@mirantis.com> | Thu Jun 01 10:36:05 2017 +0000 |
| committer | Gerrit Code Review <gerrit2@32a4cf582fa9> | Thu Jun 01 10:36:05 2017 +0000 |
| tree | 54709c20e7edfe21d01e126968841dba908a7956 | |
| parent | 179553f6def5c9bcb6cbc59adc4ad0161a2519cd [diff] | |
| parent | 5ebdfcebfd53996e57d67a9306d44eb12e138a26 [diff] |
Merge "proxy_minion fix"
diff --git a/README.rst b/README.rst index ee93fcf..556c54e 100644 --- a/README.rst +++ b/README.rst
@@ -326,6 +326,14 @@ .. literalinclude:: tests/pillar/minion_pki_cert.sls :language: yaml +Salt minion trust CA certificates issued by salt CA on a specific host (ie: salt-master node) + +.. code-block:: yaml + + salt: + minion: + trusted_ca_minions: + - cfg01 Salt control (cloud/kvm/docker) -------------------------------