diff --git a/website/source/docs/provisioners/salt-masterless.html.markdown b/website/source/docs/provisioners/salt-masterless.html.markdown new file mode 100644 index 000000000..0ed1ea51e --- /dev/null +++ b/website/source/docs/provisioners/salt-masterless.html.markdown @@ -0,0 +1,38 @@ +--- +layout: "docs" +--- + +# Salt Masterless Provisioner + +Type: `salt-masterless` + +The salt-masterless provisioner provisions machines built by Packer using [Salt](http://saltstack.com/) states. + +## Basic Example + +The example below is fully functional. + +
+{
+ "type": "salt-masterless",
+ "bootstrap_args": "git v0.16.0"
+ "local_state_tree": "/Users/me/salt"
+}
+
+
+## Configuration Reference
+
+The reference of available configuration options is listed below. The only required argument is the path to your local salt state tree.
+
+Required:
+
+* `local_state_tree` (string) - The path to your local [state tree](http://docs.saltstack.com/ref/states/highstate.html#the-salt-state-tree). This will be uploaded to the `/srv/salt` on the remote, and removed before shutdown.
+
+Optional:
+
+* `skip_bootstrap` (boolean) - By default the salt provisioner runs [salt bootstrap](https://github.com/saltstack/salt-bootstrap) to install salt. Set this to true to skip this step.
+
+* `boostrap_args` (string) -
+ Arguments to send to the bootstrap script. Usage is somewhat documented on [github](https://github.com/saltstack/salt-bootstrap), but the [script itself](https://github.com/saltstack/salt-bootstrap/blob/develop/bootstrap-salt.sh) has more detailed usage instructions. By default, no arguments are sent to the script.
+
+* `temp_config_dir` (string) - Where your local state tree will be copied before moving to the `/srv/salt` directory. Default is `/tmp/salt`.
diff --git a/website/source/docs/provisioners/salt.html.markdown b/website/source/docs/provisioners/salt.html.markdown
index 0ed1ea51e..16689a426 100644
--- a/website/source/docs/provisioners/salt.html.markdown
+++ b/website/source/docs/provisioners/salt.html.markdown
@@ -6,7 +6,8 @@ layout: "docs"
Type: `salt-masterless`
-The salt-masterless provisioner provisions machines built by Packer using [Salt](http://saltstack.com/) states.
+The `salt-masterless` provisioner provisions machines built by Packer using
+[Salt](http://saltstack.com/) states, without connecting to a Salt master.
## Basic Example
@@ -15,7 +16,6 @@ The example below is fully functional.
{
"type": "salt-masterless",
- "bootstrap_args": "git v0.16.0"
"local_state_tree": "/Users/me/salt"
}
@@ -26,13 +26,22 @@ The reference of available configuration options is listed below. The only requi
Required:
-* `local_state_tree` (string) - The path to your local [state tree](http://docs.saltstack.com/ref/states/highstate.html#the-salt-state-tree). This will be uploaded to the `/srv/salt` on the remote, and removed before shutdown.
+* `local_state_tree` (string) - The path to your local
+ [state tree](http://docs.saltstack.com/ref/states/highstate.html#the-salt-state-tree).
+ This will be uploaded to the `/srv/salt` on the remote, and removed before
+ shutdown.
Optional:
-* `skip_bootstrap` (boolean) - By default the salt provisioner runs [salt bootstrap](https://github.com/saltstack/salt-bootstrap) to install salt. Set this to true to skip this step.
+* `skip_bootstrap` (boolean) - By default the salt provisioner runs
+ [salt bootstrap](https://github.com/saltstack/salt-bootstrap) to install
+ salt. Set this to true to skip this step.
-* `boostrap_args` (string) -
- Arguments to send to the bootstrap script. Usage is somewhat documented on [github](https://github.com/saltstack/salt-bootstrap), but the [script itself](https://github.com/saltstack/salt-bootstrap/blob/develop/bootstrap-salt.sh) has more detailed usage instructions. By default, no arguments are sent to the script.
+* `boostrap_args` (string) - Arguments to send to the bootstrap script. Usage
+ is somewhat documented on [github](https://github.com/saltstack/salt-bootstrap),
+ but the [script itself](https://github.com/saltstack/salt-bootstrap/blob/develop/bootstrap-salt.sh)
+ has more detailed usage instructions. By default, no arguments are sent to
+ the script.
-* `temp_config_dir` (string) - Where your local state tree will be copied before moving to the `/srv/salt` directory. Default is `/tmp/salt`.
+* `temp_config_dir` (string) - Where your local state tree will be copied
+ before moving to the `/srv/salt` directory. Default is `/tmp/salt`.
diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb
index b7abfffed..7264385c8 100644
--- a/website/source/layouts/docs.erb
+++ b/website/source/layouts/docs.erb
@@ -38,6 +38,7 @@