Revert "Improve SSH logging for debugging"

This commit is contained in:
Jerzy Szczepkowski
2015-07-24 13:36:16 +02:00
parent 291acd1a09
commit 496895d610
9 changed files with 89 additions and 153 deletions

View File

@@ -24,7 +24,6 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
"github.com/GoogleCloudPlatform/kubernetes/test/e2e/ssh"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
@@ -139,7 +138,7 @@ func issueSSHCommand(node *api.Node, provider, cmd string) error {
return fmt.Errorf("couldn't find external IP address for node %s", node.Name)
}
Logf("Calling %s on %s", cmd, node.Name)
if _, _, code, err := ssh.SSH(cmd, host, provider); code != 0 || err != nil {
if _, _, code, err := SSH(cmd, host, provider); code != 0 || err != nil {
return fmt.Errorf("when running %s on %s, got %d and %v", cmd, node.Name, code, err)
}
return nil