docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add a Rackspace Docker install option. 

Signed-off-by: Ash Wilson <ash.wilson@rackspace.com>
This commit is contained in:
Ash Wilson 2014-12-15 11:40:34 -05:00 committed by Guillaume Giamarchi
parent c5c15618e8
commit cd97f87f6c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/rackspace/rackspace.go
View File

@ -84,6 +84,11 @@ func GetCreateFlags() []cli.Flag {
Usage: "SSH port for the newly booted machine. Set to 22 by default", Usage: "SSH port for the newly booted machine. Set to 22 by default",
Value: 22, 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.FlavorId = flags.String("rackspace-flavor-id")
d.SSHUser = flags.String("rackspace-ssh-user") d.SSHUser = flags.String("rackspace-ssh-user")
d.SSHPort = flags.Int("rackspace-ssh-port") d.SSHPort = flags.Int("rackspace-ssh-port")
d.EnableDockerInstall = flags.String("rackspace-docker-install") == "true"
if d.Region == "" { if d.Region == "" {
return missingEnvOrOption("Region", "OS_REGION_NAME", "--rackspace-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) return fmt.Errorf(`Invalid endpoint type "%s". Endpoint type must be publicURL, adminURL or internalURL.`, d.EndpointType)
} }
d.EnableDockerInstall = true
return nil return nil
} }