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

remove unused if

This commit is contained in:
Joshua Seidel 2015-07-08 15:15:50 -04:00
parent 7f4a5ac413
commit cd58da773c
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -348,20 +348,16 @@ func (p *Provisioner) deployConfigFiles(
return fmt.Errorf("Uploading %s failed: %v", validationKey, err) return fmt.Errorf("Uploading %s failed: %v", validationKey, err)
} }
if p.SecretKeyPath != ""
{
// Open the secret key file // Open the secret key file
f, err := os.Open(p.SecretKeyPath) s, err := os.Open(p.SecretKeyPath)
if err != nil { if err != nil {
return err return err
} }
defer f.Close() defer s.Close()
// Copy the secret key to the new instance // Copy the secret key to the new instance
if err := comm.Upload(path.Join(confDir, secretKey), f); err != nil { if err := comm.Upload(path.Join(confDir, secretKey), s); err != nil {
return fmt.Errorf("Uploading %s failed: %v", secretKey, err) return fmt.Errorf("Uploading %s failed: %v", secretKey, err)
}
return
} }
// Make strings.Join available for use within the template // Make strings.Join available for use within the template