From 9d4c8e8b1c562dd03247fb6d111e796fa41fc1d6 Mon Sep 17 00:00:00 2001 From: patrickdillon Date: Fri, 6 Mar 2020 11:51:48 -0500 Subject: [PATCH] Update error message when gather bootstrap fails from create cluster. The gather bootstrap error message specifies to use the --key command to specify a key. When that error message is shown after running create cluster, users may think the --key flag is available in the create cluster command. Addresses: #3188 --- cmd/openshift-install/create.go | 2 +- cmd/openshift-install/gather.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/openshift-install/create.go b/cmd/openshift-install/create.go index 70a8201a8d6..078d80bb961 100644 --- a/cmd/openshift-install/create.go +++ b/cmd/openshift-install/create.go @@ -103,7 +103,7 @@ var ( logrus.Error("Attempted to gather ClusterOperator status after installation failure: ", err2) } if err2 := runGatherBootstrapCmd(rootOpts.dir); err2 != nil { - logrus.Error("Attempted to gather debug logs after installation failure: ", err2) + logrus.Error("Attempted to gather debug logs after installation failure by running openshift-install gather bootstrap:", err2) } logrus.Fatal("Bootstrap failed to complete: ", err) } diff --git a/cmd/openshift-install/gather.go b/cmd/openshift-install/gather.go index a0060b12f30..7b309d8dfdf 100644 --- a/cmd/openshift-install/gather.go +++ b/cmd/openshift-install/gather.go @@ -124,7 +124,7 @@ func logGatherBootstrap(bootstrap string, port int, masters []string, directory logrus.Info("Pulling debug logs from the bootstrap machine") client, err := ssh.NewClient("core", net.JoinHostPort(bootstrap, strconv.Itoa(port)), gatherBootstrapOpts.sshKeys) if err != nil && strings.Contains(err.Error(), "ssh: handshake failed: ssh: unable to authenticate") { - return errors.Wrap(err, "failed to create SSH client, ensure the private key is added to your authentication agent (ssh-agent) or specified with the --key parameter") + return errors.Wrap(err, "failed to create SSH session, ensure the private key is added to your authentication agent (ssh-agent) or specified with the --key parameter") } else if err != nil { return errors.Wrap(err, "failed to create SSH client") }