Browse code

Merge pull request #11597 from coreydaley/github_10807_better_warning_8443_not_accessible

Merged by openshift-bot

OpenShift Bot authored on 2016/10/28 11:03:28
Showing 2 changed files
... ...
@@ -373,7 +373,7 @@ func (h *Helper) Start(opt *StartOptions, out io.Writer) (string, error) {
373 373
 	fmt.Fprintf(out, "Waiting for API server to start listening\n")
374 374
 	masterHost := fmt.Sprintf("%s:8443", opt.ServerIP)
375 375
 	if err = cmdutil.WaitForSuccessfulDial(true, "tcp", masterHost, 200*time.Millisecond, 1*time.Second, serverUpTimeout); err != nil {
376
-		return "", ErrTimedOutWaitingForStart(h.containerName).WithDetails(h.OriginLog())
376
+		return "", errors.NewError("timed out waiting for OpenShift container %q \nWARNING: %s:8443 may be blocked by firewall rules", h.containerName, opt.ServerIP).WithSolution("Ensure that you can access %s from your machine", masterHost).WithDetails(h.OriginLog())
377 377
 	}
378 378
 	// Check for healthz endpoint to be ready
379 379
 	client, err := masterHTTPClient(configDir)
... ...
@@ -610,7 +610,7 @@ func (c *ClientStartConfig) CheckAvailablePorts(out io.Writer) error {
610 610
 		err = c.OpenShiftHelper().TestPorts(openshift.PortsWithAlternateDNS)
611 611
 		if err == nil {
612 612
 			c.DNSPort = openshift.AlternateDNSPort
613
-			fmt.Fprintf(out, "WARNING: Binding DNS on port %d instead of 53, which may be not be resolvable from all clients.\n", openshift.AlternateDNSPort)
613
+			fmt.Fprintf(out, "WARNING: Binding DNS on port %d instead of 53, which may not be resolvable from all clients.\n", openshift.AlternateDNSPort)
614 614
 			return nil
615 615
 		}
616 616
 	}