Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etcdctl/upgrade: use peer flags for peer transport

Browse Source
This commit is contained in:
Yicheng Qin 2015-02-04 21:49:14 -08:00
parent 38038e476a
commit 599e821309
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etcdctl/command/upgrade.go
View File

@ -23,6 +23,7 @@ import (
"os" "os"
"github.com/coreos/etcd/Godeps/_workspace/src/github.com/codegangsta/cli" "github.com/coreos/etcd/Godeps/_workspace/src/github.com/codegangsta/cli"
"github.com/coreos/etcd/pkg/transport"
) )
func UpgradeCommand() cli.Command { func UpgradeCommand() cli.Command {
@ -33,6 +34,9 @@ func UpgradeCommand() cli.Command {
cli.StringFlag{Name: "old-version", Value: "1", Usage: "Old internal version"}, cli.StringFlag{Name: "old-version", Value: "1", Usage: "Old internal version"},
cli.StringFlag{Name: "new-version", Value: "2", Usage: "New internal version"}, cli.StringFlag{Name: "new-version", Value: "2", Usage: "New internal version"},
cli.StringFlag{Name: "peer-url", Value: "", Usage: "An etcd peer url string"}, cli.StringFlag{Name: "peer-url", Value: "", Usage: "An etcd peer url string"},
cli.StringFlag{Name: "peer-cert-file", Value: "", Usage: "identify HTTPS peer using this SSL certificate file"},
cli.StringFlag{Name: "peer-key-file", Value: "", Usage: "identify HTTPS peer using this SSL key file"},
cli.StringFlag{Name: "peer-ca-file", Value: "", Usage: "verify certificates of HTTPS-enabled peers using this CA bundle"},
}, },
Action: handleUpgrade, Action: handleUpgrade,
} }
@ -47,7 +51,12 @@ func handleUpgrade(c *cli.Context) {
fmt.Printf("Do not support upgrade to version %s\n", c.String("new-version")) fmt.Printf("Do not support upgrade to version %s\n", c.String("new-version"))
os.Exit(1) os.Exit(1)
} }
t, err := getTransport(c) tls := transport.TLSInfo{
CAFile: c.String("peer-ca-file"),
CertFile: c.String("peer-cert-file"),
KeyFile: c.String("peer-key-file"),
}
t, err := transport.NewTransport(tls)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }