Gotea/docker-machine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rackspace: update env var and docs for flavor-id

Browse Source 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett
2015-04-02 10:01:42 -04:00
parent 505c83629f
commit 10e8c446a7
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/index.md
View File

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

2
drivers/rackspace/rackspace.go
View File

@@ -81,7 +81,7 @@ func GetCreateFlags() []cli.Flag {
Name: "rackspace-flavor-id", Name: "rackspace-flavor-id",
Usage: "Rackspace flavor ID. Default: General Purpose 1GB", Usage: "Rackspace flavor ID. Default: General Purpose 1GB",
Value: "general1-1", Value: "general1-1",
EnvVar: "RACKSPACE_FLAVOR_ID", EnvVar: "OS_FLAVOR_ID",
}, },
cli.StringFlag{ cli.StringFlag{
Name: "rackspace-ssh-user", Name: "rackspace-ssh-user",