Commit b92aed55 authored by Mitchell Hashimoto's avatar Mitchell Hashimoto

provisioner/puppet-masterless: more sane messaging

parent 023678fe
...@@ -149,7 +149,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error { ...@@ -149,7 +149,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
// Upload all modules // Upload all modules
modulePaths := make([]string, 0, len(p.config.ModulePaths)) modulePaths := make([]string, 0, len(p.config.ModulePaths))
for i, path := range p.config.ModulePaths { for i, path := range p.config.ModulePaths {
ui.Message(fmt.Sprintf("Upload local modules from: %s", path)) ui.Message(fmt.Sprintf("Uploading local modules from: %s", path))
targetPath := fmt.Sprintf("%s/module-%d", p.config.StagingDir, i) targetPath := fmt.Sprintf("%s/module-%d", p.config.StagingDir, i)
if err := p.uploadDirectory(ui, comm, targetPath, path); err != nil { if err := p.uploadDirectory(ui, comm, targetPath, path); err != nil {
return fmt.Errorf("Error uploading modules: %s", err) return fmt.Errorf("Error uploading modules: %s", err)
...@@ -179,7 +179,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error { ...@@ -179,7 +179,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
Command: command, Command: command,
} }
ui.Message("Running Puppet...") ui.Message(fmt.Sprintf("Running Puppet: %s", command))
if err := cmd.StartWithUi(comm, ui); err != nil { if err := cmd.StartWithUi(comm, ui); err != nil {
return err return err
} }
...@@ -222,7 +222,6 @@ func (p *Provisioner) uploadManifests(ui packer.Ui, comm packer.Communicator) (s ...@@ -222,7 +222,6 @@ func (p *Provisioner) uploadManifests(ui packer.Ui, comm packer.Communicator) (s
} }
func (p *Provisioner) createDir(ui packer.Ui, comm packer.Communicator, dir string) error { func (p *Provisioner) createDir(ui packer.Ui, comm packer.Communicator, dir string) error {
ui.Message(fmt.Sprintf("Creating directory: %s", dir))
cmd := &packer.RemoteCmd{ cmd := &packer.RemoteCmd{
Command: fmt.Sprintf("mkdir -p '%s'", dir), Command: fmt.Sprintf("mkdir -p '%s'", dir),
} }
......
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