Merge pull request #5473 from mprince/puppetdocs

Arguments sorting for Puppet provisioners docs

website/source/docs/provisioners/puppet-masterless.html.md

@@ -59,10 +59,6 @@ Optional parameters:
     variables](/docs/templates/engine.html) available. See
     below for more information.
 
--   `guest_os_type` (string) - The target guest OS type, either "unix" or
-    "windows". Setting this to "windows" will cause the provisioner to use
-     Windows friendly paths and commands. By default, this is "unix".
-
 -   `extra_arguments` (array of strings) - This is an array of additional options to
     pass to the puppet command when executing puppet. This allows for
     customization of the `execute_command` without having to completely replace
@@ -73,6 +69,10 @@ Optional parameters:
     [facts](https://puppetlabs.com/facter) to make
     available when Puppet is running.
 
+-   `guest_os_type` (string) - The target guest OS type, either "unix" or
+    "windows". Setting this to "windows" will cause the provisioner to use
+     Windows friendly paths and commands. By default, this is "unix".
+
 -   `hiera_config_path` (string) - The path to a local file with hiera
     configuration to be uploaded to the remote machine. Hiera data directories
     must be uploaded using the file provisioner separately.
@@ -90,11 +90,6 @@ Optional parameters:
 This option was deprecated in puppet 3.6, and removed in puppet 4.0. If you have
 multiple manifests you should use `manifest_file` instead.
 
--   `puppet_bin_dir` (string) - The path to the directory that contains the puppet
-    binary for running `puppet apply`. Usually, this would be found via the `$PATH`
-    or `%PATH%` environment variable, but some builders (notably, the Docker one) do
-    not run profile-setup scripts, therefore the path is usually empty.
-
 -   `module_paths` (array of strings) - This is an array of paths to module
     directories on your local filesystem. These will be uploaded to the
     remote machine. By default, this is empty.
@@ -103,6 +98,11 @@ multiple manifests you should use `manifest_file` instead.
     executed to run Puppet are executed with `sudo`. If this is true, then the
     sudo will be omitted.
 
+-   `puppet_bin_dir` (string) - The path to the directory that contains the puppet
+    binary for running `puppet apply`. Usually, this would be found via the `$PATH`
+    or `%PATH%` environment variable, but some builders (notably, the Docker one) do
+    not run profile-setup scripts, therefore the path is usually empty.
+
 -   `staging_directory` (string) - This is the directory where all the configuration
     of Puppet by Packer will be placed. By default this is "/tmp/packer-puppet-masterless"
     when guest OS type is unix and "C:/Windows/Temp/packer-puppet-masterless" when windows.

website/source/docs/provisioners/puppet-server.html.md

@@ -50,9 +50,17 @@ listed below:
     contains the client private key for the node. This defaults to nothing, in
     which case a client private key won't be uploaded.
 
+-   `execute_command` (string) - The command used to execute Puppet. This has
+    various [configuration template variables](/docs/templates/engine.html) available.
+    See below for more information.
+
 -   `facter` (object of key/value strings) - Additional Facter facts to make
     available to the Puppet run.
 
+-   `guest_os_type` (string) - The target guest OS type, either "unix" or
+    "windows". Setting this to "windows" will cause the provisioner to use
+     Windows friendly paths and commands. By default, this is "unix".
+
 -   `ignore_exit_codes` (boolean) - If true, Packer will never consider the
     provisioner a failure.
 
@@ -63,6 +71,11 @@ listed below:
     executed to run Puppet are executed with `sudo`. If this is true, then the
     sudo will be omitted.
 
+-   `puppet_bin_dir` (string) - The path to the directory that contains the puppet
+    binary for running `puppet agent`. Usually, this would be found via the `$PATH`
+    or `%PATH%` environment variable, but some builders (notably, the Docker one) do
+    not run profile-setup scripts, therefore the path is usually empty.
+
 -   `puppet_node` (string) - The name of the node. If this isn't set, the fully
     qualified domain name will be used.
 
@@ -76,18 +89,10 @@ listed below:
     to create directories and write into this folder. If the permissions are not
     correct, use a shell provisioner prior to this to configure it properly.
 
--   `puppet_bin_dir` (string) - The path to the directory that contains the puppet
-    binary for running `puppet agent`. Usually, this would be found via the `$PATH`
-    or `%PATH%` environment variable, but some builders (notably, the Docker one) do
-    not run profile-setup scripts, therefore the path is usually empty.
+## Execute Command
 
--   `guest_os_type` (string) - The target guest OS type, either "unix" or
-    "windows". Setting this to "windows" will cause the provisioner to use
-     Windows friendly paths and commands. By default, this is "unix".
-
--   `execute_command` (string) - This is optional. The command used to execute Puppet. This has
-    various [configuration template variables](/docs/templates/engine.html) available. By default,
-    Packer uses the following command (broken across multiple lines for readability) to execute Puppet:
+By default, Packer uses the following command (broken across multiple lines for
+readability) to execute Puppet:
 
 ```
 {{.FacterVars}} {{if .Sudo}}sudo -E {{end}}