From 8f7733623111a8a65245ebba57ff3620e83d093f Mon Sep 17 00:00:00 2001 From: zchee Date: Thu, 14 May 2015 08:49:04 +0900 Subject: [PATCH] Update docs for Rackspace Signed-off-by: Koichi Shiraishi --- docs/index.md | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/docs/index.md b/docs/index.md index 36a5616375..f622351daf 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1339,30 +1339,32 @@ Create machines on [Rackspace cloud](http://www.rackspace.com/cloud) Options: - - `--rackspace-username`: Rackspace account username - - `--rackspace-api-key`: Rackspace API key - - `--rackspace-region`: Rackspace region name - - `--rackspace-endpoint-type`: Rackspace endpoint type (adminURL, internalURL or the default publicURL) - - `--rackspace-image-id`: Rackspace image ID. Default: Ubuntu 14.10 (Utopic Unicorn) (PVHVM) - - `--rackspace-flavor-id`: Rackspace flavor ID. Default: General Purpose 1GB - - `--rackspace-ssh-user`: SSH user for the newly booted machine. Set to root by default - - `--rackspace-ssh-port`: SSH port for the newly booted machine. Set to 22 by default - -Environment variables: - -Here comes the list of the supported variables with the corresponding options. If both environment -variable and CLI option are provided the CLI option takes the precedence. - -| Environment variable | CLI option | -|----------------------|-----------------------------| -| `OS_USERNAME` | `--rackspace-username` | -| `OS_API_KEY` | `--rackspace-api-key` | -| `OS_REGION_NAME` | `--rackspace-region` | -| `OS_ENDPOINT_TYPE` | `--rackspace-endpoint-type` | -| `OS_FLAVOR_ID` | `--rackspace-flavor-id` | + - `--rackspace-username`: **required** Rackspace account username. + - `--rackspace-api-key`: **required** Rackspace API key. + - `--rackspace-region`: **required** Rackspace region name. + - `--rackspace-endpoint-type`: Rackspace endpoint type (`adminURL`, `internalURL` or the default `publicURL`). + - `--rackspace-image-id`: Rackspace image ID. Default: Ubuntu 14.10 (Utopic Unicorn) (PVHVM). + - `--rackspace-flavor-id`: Rackspace flavor ID. Default: General Purpose 1GB. + - `--rackspace-ssh-user`: SSH user for the newly booted machine. + - `--rackspace-ssh-port`: SSH port for the newly booted machine. + - `--rackspace-docker-install`: Set if Docker has to be installed on the machine. The Rackspace driver will use `598a4282-f14b-4e50-af4c-b3e52749d9f9` (Ubuntu 14.04 LTS) by default. +Environment variables and default values: + +| CLI option | Environment variable | Default | +|------------------------------|----------------------|----------------------------------------| +| **`--rackspace-username`** | `OS_USERNAME` | - | +| **`--rackspace-api-key`** | `OS_API_KEY` | - | +| **`--rackspace-region`** | `OS_REGION_NAME` | - | +| `--rackspace-endpoint-type` | `OS_ENDPOINT_TYPE` | `publicURL` | +| `--rackspace-image-id` | - | `598a4282-f14b-4e50-af4c-b3e52749d9f9` | +| `--rackspace-flavor-id` | `OS_FLAVOR_ID` | `general1-1` | +| `--rackspace-ssh-user` | - | `root` | +| `--rackspace-ssh-port` | - | `22` | +| `--rackspace-docker-install` | - | `true` | + #### Oracle VirtualBox Create machines locally using [VirtualBox](https://www.virtualbox.org/).