From e0d947c707b24f9fcb169218bab46f40caa76ce0 Mon Sep 17 00:00:00 2001 From: Andrew Pashkin Date: Wed, 13 Apr 2016 10:30:08 +0300 Subject: [PATCH 1/2] Document "grains" setting in the minion configuration reference --- doc/ref/configuration/minion.rst | 23 +++++++++++++++++++++++ doc/topics/targeting/grains.rst | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/doc/ref/configuration/minion.rst b/doc/ref/configuration/minion.rst index 02324f2772f9..be7e318d0c05 100644 --- a/doc/ref/configuration/minion.rst +++ b/doc/ref/configuration/minion.rst @@ -331,6 +331,29 @@ executed. By default this feature is disabled, to enable set cache_jobs to cache_jobs: False +.. conf_minion:: grains + +``grains`` +---------- + +Default: (empty) + +.. seealso:: + :ref:`static-custom-grains` + +Statically assigns grains to the minion. + +.. code-block:: yaml + + grains: + roles: + - webserver + - memcache + deployment: datacenter4 + cabinet: 13 + cab_u: 14-15 + +>>>>>>> Document "grains" setting in the minion configuration reference .. conf_minion:: grains_cache ``grains_cache`` diff --git a/doc/topics/targeting/grains.rst b/doc/topics/targeting/grains.rst index 1e13f44c3d04..acb071e08459 100644 --- a/doc/topics/targeting/grains.rst +++ b/doc/topics/targeting/grains.rst @@ -73,7 +73,7 @@ Grains in the Minion Config =========================== Grains can also be statically assigned within the minion configuration file. -Just add the option ``grains`` and pass options to it: +Just add the option :conf_minion:`grains` and pass options to it: .. code-block:: yaml From 46a4e8a310b7f8e11f481adf76ef5dcce7af74bc Mon Sep 17 00:00:00 2001 From: rallytime Date: Wed, 13 Apr 2016 09:05:31 -0600 Subject: [PATCH 2/2] Remove merge conflict line --- doc/ref/configuration/minion.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/ref/configuration/minion.rst b/doc/ref/configuration/minion.rst index be7e318d0c05..05c58fab8016 100644 --- a/doc/ref/configuration/minion.rst +++ b/doc/ref/configuration/minion.rst @@ -353,7 +353,6 @@ Statically assigns grains to the minion. cabinet: 13 cab_u: 14-15 ->>>>>>> Document "grains" setting in the minion configuration reference .. conf_minion:: grains_cache ``grains_cache``