Added support for passing arguments to salt-call.

anish · Nov 11, 2016 · 200aa74 · 200aa74
1 parent 671f155
commit 200aa74
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/provisioner/salt-masterless/provisioner.go b/provisioner/salt-masterless/provisioner.go
@@ -55,6 +55,9 @@ type Config struct {
 	// Set the logging level for the salt-call run
 	LogLevel string `mapstructure:"log_level"`
 
+	// Arguments to pass to salt-call
+	SaltCallArgs string `mapstructure:"salt_call_args"`
+
 	// Command line args passed onto salt-call
 	CmdArgs string ""
 
@@ -143,6 +146,11 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
 		cmd_args.WriteString(p.config.LogLevel)
 	}
 
+	if p.config.SaltCallArgs != "" {
+		cmd_args.WriteString(" ")
+		cmd_args.WriteString(p.config.SaltCallArgs)
+	}
+
 	p.config.CmdArgs = cmd_args.String()
 
 	if errs != nil && len(errs.Errors) > 0 {

diff --git a/website/source/docs/provisioners/salt-masterless.html.md b/website/source/docs/provisioners/salt-masterless.html.md
@@ -76,3 +76,8 @@ Optional:
     fails. Set this option to true to ignore Salt failures.
 
 -   `log_level` (string) - Set the logging level for the `salt-call` run.
+
+-   `salt_call_args` (string) - Additional arguments to pass directly to `salt-call`. See
+    [salt-call](https://docs.saltstack.com/ref/cli/salt-call.html) documentation for more
+    information. By default no additional arguments (besides the ones Packer generates)
+    are passed to `salt-call`.