Commit c9ef6665 authored by Mitchell Hashimoto's avatar Mitchell Hashimoto

fmt

parent 6665162d
...@@ -60,11 +60,11 @@ func (p *Provisioner) Prepare(raws ...interface{}) error { ...@@ -60,11 +60,11 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
errs := common.CheckUnusedConfig(md) errs := common.CheckUnusedConfig(md)
templates := map[string]*string{ templates := map[string]*string{
"bootstrap_args": &p.config.BootstrapArgs, "bootstrap_args": &p.config.BootstrapArgs,
"minion_config": &p.config.MinionConfig, "minion_config": &p.config.MinionConfig,
"local_state_tree": &p.config.LocalStateTree, "local_state_tree": &p.config.LocalStateTree,
"local_pillar_roots": &p.config.LocalPillarRoots, "local_pillar_roots": &p.config.LocalPillarRoots,
"temp_config_dir": &p.config.TempConfigDir, "temp_config_dir": &p.config.TempConfigDir,
} }
for n, ptr := range templates { for n, ptr := range templates {
...@@ -156,7 +156,6 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error { ...@@ -156,7 +156,6 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
} }
if p.config.LocalPillarRoots != "" { if p.config.LocalPillarRoots != "" {
ui.Message(fmt.Sprintf("Creating remote pillar directory: %s/pillar", p.config.TempConfigDir)) ui.Message(fmt.Sprintf("Creating remote pillar directory: %s/pillar", p.config.TempConfigDir))
cmd := &packer.RemoteCmd{Command: fmt.Sprintf("mkdir -p %s/pillar", p.config.TempConfigDir)} cmd := &packer.RemoteCmd{Command: fmt.Sprintf("mkdir -p %s/pillar", p.config.TempConfigDir)}
if err = cmd.StartWithUi(comm, ui); err != nil || cmd.ExitStatus != 0 { if err = cmd.StartWithUi(comm, ui); err != nil || cmd.ExitStatus != 0 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment