Skip to content

Commit

Permalink
Merge pull request #2168 from svanharmelen/b-chef-provisioner-interpo…
Browse files Browse the repository at this point in the history
…lation

provisioner/chef: fix interpolation in the Chef provisioner
  • Loading branch information
phinze committed Jun 1, 2015
2 parents 084b13d + be56a3a commit 6a8456c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions builtin/provisioners/chef/resource_provisioner.go
Original file line number Diff line number Diff line change
Expand Up @@ -182,15 +182,15 @@ func (r *ResourceProvisioner) decodeConfig(c *terraform.ResourceConfig) (*Provis
return nil, err
}

if err := dec.Decode(c.Raw); err != nil {
if err := dec.Decode(c.Config); err != nil {
return nil, err
}

if p.Environment == "" {
p.Environment = defaultEnv
}

if attrs, ok := c.Raw["attributes"]; ok {
if attrs, ok := c.Config["attributes"]; ok {
p.Attributes, err = rawToJSON(attrs)
if err != nil {
return nil, fmt.Errorf("Error parsing the attributes: %v", err)
Expand Down

0 comments on commit 6a8456c

Please sign in to comment.