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

Merge pull request #706 from ehazlett/rackspace-flavor-env-var 

rackspace: enable env var for flavor id
This commit is contained in:
Evan Hazlett 2015-04-03 10:39:45 -04:00
parent be9113abf8 10e8c446a7
commit b9f191cedd
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/index.md
View File

@ -823,6 +823,7 @@ variable and CLI option are provided the CLI option takes the precedence.
| `OS_API_KEY` | `--rackspace-ap-key` |
| `OS_REGION_NAME` | `--rackspace-region` |
| `OS_ENDPOINT_TYPE` | `--rackspace-endpoint-type` |
| `OS_FLAVOR_ID` | `--rackspace-flavor-id` |
The Rackspace driver will use `598a4282-f14b-4e50-af4c-b3e52749d9f9` (Ubuntu 14.04 LTS) by default.

8
drivers/rackspace/rackspace.go
View File

@ -58,12 +58,12 @@ func GetCreateFlags() []cli.Flag {
cli.StringFlag{
Name: "rackspace-image-id",
Usage: "Rackspace image ID. Default: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)",
Value: "",
},
cli.StringFlag{
Name: "rackspace-flavor-id",
Usage: "Rackspace flavor ID. Default: General Purpose 1GB",
Value: "general1-1",
Name: "rackspace-flavor-id",
Usage: "Rackspace flavor ID. Default: General Purpose 1GB",
Value: "general1-1",
EnvVar: "OS_FLAVOR_ID",
},
cli.StringFlag{
Name: "rackspace-ssh-user",