iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8639 from hashicorp/fix_8627 

provisioner/shell: Fix envVarFile clean up issue
This commit is contained in:
Wilken Rivera 2020-01-23 16:23:12 -05:00 committed by GitHub
parent b0b10f6939 b80882f3b8
commit ecf11816c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
provisioner/shell/provisioner.go
View File

@ -129,8 +129,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
} }
if p.config.RemotePath == "" { if p.config.RemotePath == "" {
p.config.RemotePath = fmt.Sprintf( p.config.RemotePath = fmt.Sprintf("%s/%s", p.config.RemoteFolder, p.config.RemoteFile)
"%s/%s", p.config.RemoteFolder, p.config.RemoteFile)
} }
if p.config.Scripts == nil { if p.config.Scripts == nil {
@ -232,7 +231,6 @@ func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, comm packer.C
} }
p.config.envVarFile = tf.Name() p.config.envVarFile = tf.Name()
defer os.Remove(p.config.envVarFile)
// upload the var file // upload the var file
var cmd *packer.RemoteCmd var cmd *packer.RemoteCmd
@ -256,9 +254,7 @@ func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, comm packer.C
Command: fmt.Sprintf("chmod 0600 %s", remoteVFName), Command: fmt.Sprintf("chmod 0600 %s", remoteVFName),
} }
if err := comm.Start(ctx, cmd); err != nil { if err := comm.Start(ctx, cmd); err != nil {
return fmt.Errorf( return fmt.Errorf("Error chmodding script file to 0600 in remote machine: %s", err)
"Error chmodding script file to 0600 in remote "+
"machine: %s", err)
} }
cmd.Wait() cmd.Wait()
p.config.envVarFile = remoteVFName p.config.envVarFile = remoteVFName
@ -345,19 +341,22 @@ func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, comm packer.C
return err return err
} }
if !p.config.SkipClean { if p.config.SkipClean {
continue
}
// Delete the temporary file we created. We retry this a few times // Delete the temporary file we created. We retry this a few times
// since if the above rebooted we have to wait until the reboot // since if the above rebooted we have to wait until the reboot
// completes. // completes.
err = p.cleanupRemoteFile(p.config.RemotePath, comm) if err := p.cleanupRemoteFile(p.config.RemotePath, comm); err != nil {
if err != nil { return err
return err }
}
err = p.cleanupRemoteFile(p.config.envVarFile, comm) }
if err != nil {
return err if !p.config.SkipClean {
} if err := p.cleanupRemoteFile(p.config.envVarFile, comm); err != nil {
return err
} }
} }