Merge pull request #2244 from patrickdillon/gather-error-msg

openshift-merge-robot · web-flow · commit b0abc58b2833 · 2019-08-28T05:10:14.000+02:00
Update error message when automatic gather boostrap fails on cluster fail.
diff --git a/cmd/openshift-install/create.go b/cmd/openshift-install/create.go
@@ -97,9 +97,9 @@ var (
 				err = waitForBootstrapComplete(ctx, config, rootOpts.dir)
 				if err != nil {
 					if err2 := runGatherBootstrapCmd(rootOpts.dir); err2 != nil {
-						logrus.Error(err2)
+						logrus.Error("Attempted to gather debug logs after installation failure: ", err2)
 					}
-					logrus.Fatal(err)
+					logrus.Fatal("Bootstrap failed to complete: ", err)
 				}
 
 				logrus.Info("Destroying the bootstrap resources...")

Original file line number	Diff line number	Diff line change
`@@ -97,9 +97,9 @@ var (`
`97`	`97`	`err = waitForBootstrapComplete(ctx, config, rootOpts.dir)`
`98`	`98`	`if err != nil {`
`99`	`99`	`if err2 := runGatherBootstrapCmd(rootOpts.dir); err2 != nil {`
`100`		`- logrus.Error(err2)`
	`100`	`+ logrus.Error("Attempted to gather debug logs after installation failure: ", err2)`
`101`	`101`	`}`
`102`		`- logrus.Fatal(err)`
	`102`	`+ logrus.Fatal("Bootstrap failed to complete: ", err)`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`logrus.Info("Destroying the bootstrap resources...")`