fix ssh and package steps to use source syntax.

This commit is contained in:
Megan Marsh 2019-09-18 13:15:49 -07:00
parent 35922ca327
commit 30f86bb778
2 changed files with 9 additions and 2 deletions

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, ","))
}

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