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

Merge pull request #7917 from hashicorp/cleanup_unused_cancel_funcs 

These cancel functions have been obsolete since March 2019
This commit is contained in:
Megan Marsh 2019-07-26 14:42:06 -07:00 committed by GitHub
parent 7ac17126a0 0f704fb5b2
commit 903a422020
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 0 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
provisioner/ansible/provisioner.go
View File

@ -343,16 +343,6 @@ func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, comm packer.C
return nil
}
func (p *Provisioner) Cancel() {
if p.done != nil {
close(p.done)
}
if p.adapter != nil {
p.adapter.Shutdown()
}
os.Exit(0)
}
func (p *Provisioner) executeAnsible(ui packer.Ui, comm packer.Communicator, privKeyFile string) error {
playbook, _ := filepath.Abs(p.config.PlaybookFile)
inventory := p.config.InventoryFile

6
provisioner/breakpoint/provisioner.go
View File

@ -3,7 +3,6 @@ package breakpoint
import (
"context"
"fmt"
"os"
"golang.org/x/sync/errgroup"
@ -79,8 +78,3 @@ func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, comm packer.C
}
return nil
}
func (p *Provisioner) Cancel() {
// Just hard quit.
os.Exit(0)
}

6
provisioner/converge/provisioner.go
View File

@ -234,9 +234,3 @@ func (p *Provisioner) applyModules(ui packer.Ui, comm packer.Communicator) error
return nil
}
// Cancel the provisioning process
func (p *Provisioner) Cancel() {
// there's not an awful lot we can do to cancel Converge at the moment.
// The default semantics are fine.
}

9
provisioner/inspec/provisioner.go
View File

@ -317,15 +317,6 @@ func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, comm packer.C
return nil
}
func (p *Provisioner) Cancel() {
if p.done != nil {
close(p.done)
}
if p.adapter != nil {
p.adapter.Shutdown()
}
os.Exit(0)
}
func (p *Provisioner) executeInspec(ui packer.Ui, comm packer.Communicator, privKeyFile string) error {
var envvars []string

6
provisioner/powershell/provisioner.go
View File

@ -305,12 +305,6 @@ func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, comm packer.C
return nil
}
func (p *Provisioner) Cancel() {
// Just hard quit. It isn't a big deal if what we're doing keeps running
// on the other side.
os.Exit(0)
}
// Environment variables required within the remote environment are uploaded
// within a PS script and then enabled by 'dot sourcing' the script
// immediately prior to execution of the main command

4
provisioner/shell-local/provisioner.go
View File

@ -30,7 +30,3 @@ func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, _ packer.Comm
return retErr
}
func (p *Provisioner) Cancel() {
// Just do nothing. When the process ends, so will our provisioner
}

2
provisioner/sleep/provisioner.go
View File

@ -26,5 +26,3 @@ func (p *Provisioner) Provision(ctx context.Context, _ packer.Ui, _ packer.Commu
return nil
}
}
func (p *Provisioner) Cancel() {}