From cd97f87f6c7b583f1dddf265901c509b55eec744 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 15 Dec 2014 11:40:34 -0500 Subject: [PATCH] Add a Rackspace Docker install option. Signed-off-by: Ash Wilson --- drivers/rackspace/rackspace.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/rackspace/rackspace.go b/drivers/rackspace/rackspace.go index ce4988b868..73bc51768c 100644 --- a/drivers/rackspace/rackspace.go +++ b/drivers/rackspace/rackspace.go @@ -84,6 +84,11 @@ func GetCreateFlags() []cli.Flag { Usage: "SSH port for the newly booted machine. Set to 22 by default", Value: 22, }, + cli.StringFlag{ + Name: "rackspace-docker-install", + Usage: "Set if docker have to be installed on the machine", + Value: "true", + }, } } @@ -128,6 +133,7 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error { d.FlavorId = flags.String("rackspace-flavor-id") d.SSHUser = flags.String("rackspace-ssh-user") d.SSHPort = flags.Int("rackspace-ssh-port") + d.EnableDockerInstall = flags.String("rackspace-docker-install") == "true" if d.Region == "" { return missingEnvOrOption("Region", "OS_REGION_NAME", "--rackspace-region") @@ -150,7 +156,5 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error { return fmt.Errorf(`Invalid endpoint type "%s". Endpoint type must be publicURL, adminURL or internalURL.`, d.EndpointType) } - d.EnableDockerInstall = true - return nil }