Wait for ssh connection

This commit is contained in:
Paweł Socha 2018-02-26 15:40:26 +01:00
parent 627bb24ea6
commit be8d39210d
1 changed files with 30 additions and 15 deletions

View File

@ -131,6 +131,24 @@ func applyFn(ctx context.Context) error {
return err return err
} }
ctx, cancelFunc := context.WithTimeout(ctx, comm.Timeout())
defer cancelFunc()
// Wait for the context to end and then disconnect
go func() {
<-ctx.Done()
comm.Disconnect()
}()
// Wait and retry until we establish the connection
err = communicator.Retry(ctx, func() error {
return comm.Connect(o)
})
if err != nil {
return err
}
var src, dst string var src, dst string
o.Output("Provisioning with Salt...") o.Output("Provisioning with Salt...")
@ -140,18 +158,16 @@ func applyFn(ctx context.Context) error {
Command: fmt.Sprintf("curl -L https://bootstrap.saltstack.com -o /tmp/install_salt.sh || wget -O /tmp/install_salt.sh https://bootstrap.saltstack.com"), Command: fmt.Sprintf("curl -L https://bootstrap.saltstack.com -o /tmp/install_salt.sh || wget -O /tmp/install_salt.sh https://bootstrap.saltstack.com"),
} }
o.Output(fmt.Sprintf("Downloading saltstack bootstrap to /tmp/install_salt.sh")) o.Output(fmt.Sprintf("Downloading saltstack bootstrap to /tmp/install_salt.sh"))
if err = comm.Start(cmd); err != nil {
err = fmt.Errorf("Unable to download Salt: %s", err)
}
err = communicator.Retry(ctx, func() error { if err == nil {
if err = comm.Start(cmd); err != nil {
return fmt.Errorf("Unable to download Salt: %s", err)
}
cmd.Wait() cmd.Wait()
if cmd.ExitStatus != 0 { if cmd.ExitStatus != 0 {
return fmt.Errorf("Curl exited with non-zero exit status: %d", cmd.ExitStatus) err = fmt.Errorf("Curl exited with non-zero exit status: %d", cmd.ExitStatus)
} }
return nil }
})
outR, outW := io.Pipe() outR, outW := io.Pipe()
errR, errW := io.Pipe() errR, errW := io.Pipe()
@ -166,17 +182,16 @@ func applyFn(ctx context.Context) error {
} }
o.Output(fmt.Sprintf("Installing Salt with command %s", cmd.Command)) o.Output(fmt.Sprintf("Installing Salt with command %s", cmd.Command))
err = communicator.Retry(ctx, func() error { if err = comm.Start(cmd); err != nil {
if err = comm.Start(cmd); err != nil { err = fmt.Errorf("Unable to install Salt: %s", err)
return fmt.Errorf("Unable to install Salt: %s", err) }
}
if err == nil {
cmd.Wait() cmd.Wait()
if cmd.ExitStatus != 0 { if cmd.ExitStatus != 0 {
return fmt.Errorf("Salt install script exited with non-zero exit status: %d", cmd.ExitStatus) err = fmt.Errorf("install_salt.sh exited with non-zero exit status: %d", cmd.ExitStatus)
} }
return nil }
})
// Wait for output to clean up // Wait for output to clean up
outW.Close() outW.Close()
errW.Close() errW.Close()