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

Merge pull request #3215 from sivel/rackspace-active-timeout 

Add --rackspace-active-timeout argument to rackspace driver
This commit is contained in:
Nathan LeClaire 2016-03-22 11:49:21 -07:00
parent c390ecd730 bd5ea7c335
commit cec812ae2f
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/rackspace/rackspace.go
View File

@ -22,6 +22,7 @@ const (
defaultSSHUser = "root" defaultSSHUser = "root"
defaultSSHPort = 22 defaultSSHPort = 22
defaultDockerInstall = "true" defaultDockerInstall = "true"
defaultActiveTimeout = 300
) )
// GetCreateFlags registers the "machine create" flags recognized by this driver, including // GetCreateFlags registers the "machine create" flags recognized by this driver, including
@ -54,7 +55,7 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
}, },
mcnflag.StringFlag{ mcnflag.StringFlag{
Name: "rackspace-image-id", Name: "rackspace-image-id",
Usage: "Rackspace image ID. Default: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)", Usage: "Rackspace image ID. Default: Ubuntu 15.10 (Wily Werewolf) (PVHVM)",
}, },
mcnflag.StringFlag{ mcnflag.StringFlag{
Name: "rackspace-flavor-id", Name: "rackspace-flavor-id",
@ -77,6 +78,12 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
Usage: "Set if docker have to be installed on the machine", Usage: "Set if docker have to be installed on the machine",
Value: defaultDockerInstall, Value: defaultDockerInstall,
}, },
mcnflag.IntFlag{
EnvVar: "OS_ACTIVE_TIMEOUT",
Name: "rackspace-active-timeout",
Usage: "Rackspace active timeout",
Value: defaultActiveTimeout,
},
} }
} }
@ -111,6 +118,7 @@ func missingEnvOrOption(setting, envVar, opt string) error {
// SetConfigFromFlags assigns and verifies the command-line arguments presented to the driver. // SetConfigFromFlags assigns and verifies the command-line arguments presented to the driver.
func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error { func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
d.ActiveTimeout = flags.Int("rackspace-active-timeout")
d.Username = flags.String("rackspace-username") d.Username = flags.String("rackspace-username")
d.APIKey = flags.String("rackspace-api-key") d.APIKey = flags.String("rackspace-api-key")
d.Region = flags.String("rackspace-region") d.Region = flags.String("rackspace-region")