ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2168 from svanharmelen/b-chef-provisioner-interpolation 

provisioner/chef: fix interpolation in the Chef provisioner
This commit is contained in:
Paul Hinze 2015-06-01 09:02:00 -05:00
parent 084b13d6ec be56a3a02e
commit 6a8456c911
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/provisioners/chef/resource_provisioner.go
View File

@ -182,7 +182,7 @@ func (r *ResourceProvisioner) decodeConfig(c *terraform.ResourceConfig) (*Provis
return nil, err return nil, err
} }
if err := dec.Decode(c.Raw); err != nil { if err := dec.Decode(c.Config); err != nil {
return nil, err return nil, err
} }
@ -190,7 +190,7 @@ func (r *ResourceProvisioner) decodeConfig(c *terraform.ResourceConfig) (*Provis
p.Environment = defaultEnv p.Environment = defaultEnv
} }
if attrs, ok := c.Raw["attributes"]; ok { if attrs, ok := c.Config["attributes"]; ok {
p.Attributes, err = rawToJSON(attrs) p.Attributes, err = rawToJSON(attrs)
if err != nil { if err != nil {
return nil, fmt.Errorf("Error parsing the attributes: %v", err) return nil, fmt.Errorf("Error parsing the attributes: %v", err)