From 2f6d9a241835bafebe6be9cb4dc2be4b6e752d86 Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Tue, 3 Feb 2015 12:44:06 -0500 Subject: [PATCH] fixes cli arg bugs Signed-off-by: Evan Hazlett --- commands.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/commands.go b/commands.go index 57c031d6..b9449abb 100644 --- a/commands.go +++ b/commands.go @@ -59,12 +59,7 @@ func (h hostListItemByName) Less(i, j int) bool { return strings.ToLower(h[i].Name) < strings.ToLower(h[j].Name) } -func beforeCreate(c *cli.Context) error { - caCertPath := c.GlobalString("tls-ca-cert") - caKeyPath := c.GlobalString("tls-ca-key") - clientCertPath := c.GlobalString("tls-client-cert") - clientKeyPath := c.GlobalString("tls-client-key") - +func setupCertificates(caCertPath, caKeyPath, clientCertPath, clientKeyPath string) error { org := utils.GetUsername() bits := 2048 @@ -129,7 +124,6 @@ var Commands = []cli.Command{ Action: cmdActive, }, { - Before: beforeCreate, Flags: append( drivers.GetCreateFlags(), cli.StringFlag{ @@ -259,6 +253,11 @@ func cmdCreate(c *cli.Context) { log.Fatal("You must specify a machine name") } + if err := setupCertificates(c.GlobalString("tls-ca-cert"), c.GlobalString("tls-ca-key"), + c.GlobalString("tls-client-cert"), c.GlobalString("tls-client-key")); err != nil { + log.Fatalf("Error generating certificates: %s", err) + } + store := NewStore(c.GlobalString("storage-path"), c.GlobalString("tls-ca-cert"), c.GlobalString("tls-ca-key")) host, err := store.Create(name, driver, c)