From d6cf70bf205ecc2d405d1510d2ac5d7401f505bc Mon Sep 17 00:00:00 2001 From: Pat O'Shea Date: Sat, 18 Jul 2015 08:25:40 -0600 Subject: [PATCH] Clarified windows guest machine support. Done at mitchellh's request. --- .../docs/source/v2/provisioning/salt.html.md | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/website/docs/source/v2/provisioning/salt.html.md b/website/docs/source/v2/provisioning/salt.html.md index 8169ec28e..938fec155 100644 --- a/website/docs/source/v2/provisioning/salt.html.md +++ b/website/docs/source/v2/provisioning/salt.html.md @@ -47,21 +47,21 @@ masterless setup. ## Install Options * `install_master` (boolean) - Should vagrant install the salt-master -on this machine. Not supported on Windows. +on this machine. Not supported on Windows guest machines. -* `no_minion` (boolean) - Don't install the minion, default `false`. Not supported on Windows. +* `no_minion` (boolean) - Don't install the minion, default `false`. Not supported on Windows guest machines. * `install_syndic` (boolean) - Install the salt-syndic, default -`false`. Not supported on Windows. +`false`. Not supported on Windows guest machines. * `install_type` (stable | git | daily | testing) - Whether to install from a distribution's stable package manager, git tree-ish, daily ppa, or testing repository. -Not supported on Windows. +Not supported on Windows guest machines. * `install_args` (develop) - When performing a git install, you can specify a branch, tag, or any treeish. If using the `custom` install type, you can also specify a different repository to install from. -Not supported on Windows. +Not supported on Windows guest machines. * `install_command` (string) - Allow specifying an arbitrary string of arguments to the bootstrap script. This will completely ignore `install_type` and `install_args` @@ -70,12 +70,12 @@ to allow more flexibility with the bootstrap process. * `always_install` (boolean) - Installs salt binaries even if they are already detected, default `false` -* `bootstrap_script` (string) - Path to your customized salt-bootstrap.sh script. Not supported on Windows. +* `bootstrap_script` (string) - Path to your customized salt-bootstrap.sh script. Not supported on Windows guest machines. * `bootstrap_options` (string) - Additional command-line options to pass to the bootstrap script. -* `version` (string, default: "2015.5.2") - Version of minion to be installed. Only supported on Windows. +* `version` (string, default: "2015.5.2") - Version of minion to be installed. Only supported on Windows guest machines. ## Minion Options These only make sense when `no_minion` is `false`. @@ -95,7 +95,7 @@ public key * `masterless` (boolean) - Calls state.highstate in local mode. Uses `minion_id` and `pillar_data` when provided. ## Master Options -These only make sense when `install_master` is `true`. Not supported on Windows. +These only make sense when `install_master` is `true`. Not supported on Windows guest machines. * `master_config` (string, default: "salt/master") Path to a custom salt master config file. @@ -121,9 +121,9 @@ Either of the following may be used to actually execute runners during provisioning. * `run_overstate` - (boolean) Executes `state.over` on -vagrant up. Can be applied to the master only. This is superceded by orchestrate. Not supported on Windows. +vagrant up. Can be applied to the master only. This is superceded by orchestrate. Not supported on Windows guest machines. * `orchestrations` - (boolean) Executes `state.orchestrate` on -vagrant up. Can be applied to the master only. This is supercedes by run_overstate. Not supported on Windows. +vagrant up. Can be applied to the master only. This is supercedes by run_overstate. Not supported on Windows guest machines. ## Output Control