From 7761c9329de70ea6fee01eb256e668b9098e6828 Mon Sep 17 00:00:00 2001 From: Kirill Kazakov Date: Fri, 27 Sep 2013 19:13:55 +0400 Subject: [PATCH] provisioner/chef-solo: fix .RolesPath and .DataBagsPath in the config template --- provisioner/chef-solo/provisioner.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/provisioner/chef-solo/provisioner.go b/provisioner/chef-solo/provisioner.go index ddfc605fb..a22b18e30 100644 --- a/provisioner/chef-solo/provisioner.go +++ b/provisioner/chef-solo/provisioner.go @@ -212,7 +212,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error { rolesPath := "" if p.config.RolesPath != "" { - rolesPath := fmt.Sprintf("%s/roles", p.config.StagingDir) + rolesPath = fmt.Sprintf("%s/roles", p.config.StagingDir) if err := p.uploadDirectory(ui, comm, rolesPath, p.config.RolesPath); err != nil { return fmt.Errorf("Error uploading roles: %s", err) } @@ -220,7 +220,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error { dataBagsPath := "" if p.config.DataBagsPath != "" { - dataBagsPath := fmt.Sprintf("%s/data_bags", p.config.StagingDir) + dataBagsPath = fmt.Sprintf("%s/data_bags", p.config.StagingDir) if err := p.uploadDirectory(ui, comm, dataBagsPath, p.config.DataBagsPath); err != nil { return fmt.Errorf("Error uploading data bags: %s", err) }