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

Merge pull request #8125 from hashicorp/fix_8019 

fix ssh and package steps to use source syntax.
This commit is contained in:
Megan Marsh 2019-09-20 10:05:49 -07:00 committed by GitHub
parent fb1eddd536 30f86bb778
commit 66a6d18be9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builder/vagrant/step_package.go
View File

@ -25,10 +25,13 @@ func (s *StepPackage) Run(ctx context.Context, state multistep.StateBag) multist
}
ui.Say("Packaging box...")
packageArgs := []string{}
box := "source"
if s.GlobalID != "" {
packageArgs = append(packageArgs, s.GlobalID)
box = s.GlobalID
}
packageArgs = append(packageArgs, box)
if len(s.Include) > 0 {
packageArgs = append(packageArgs, "--include", strings.Join(s.Include, ","))
}

6
builder/vagrant/step_ssh_config.go
View File

@ -30,7 +30,11 @@ func (s *StepSSHConfig) Run(ctx context.Context, state multistep.StateBag) multi
driver := state.Get("driver").(VagrantDriver)
config := state.Get("config").(*Config)
sshConfig, err := driver.SSHConfig(s.GlobalID)
box := "source"
if s.GlobalID != "" {
box = s.GlobalID
}
sshConfig, err := driver.SSHConfig(box)
if err != nil {
state.Put("error", err)
return multistep.ActionHalt