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

Merge pull request #1259 from exoscale/fix/exoscale-doc 

exoscale: Two small documentation fixes
This commit is contained in:
Evan Hazlett 2015-05-28 14:16:22 -04:00
parent 139eb2824c 704e5fce41
commit 67bc2d685c
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
docs/index.md
View File

@ -1163,7 +1163,7 @@ Get your API key and API secret key from [API details](https://portal.exoscale.c
Options:
- `--exoscale-url`: **required** Your API endpoint.
- `--exoscale-url`: Your API endpoint.
- `--exoscale-api-key`: **required** Your API key.
- `--exoscale-api-secret-key`: **required** Your API secret key.
- `--exoscale-instance-profile`: Instance profile.
@ -1171,23 +1171,21 @@ Options:
- `--exoscale-image`: exoscale disk size. (10, 50, 100, 200, 400)
- `--exoscale-security-group`: Security group. It will be created if it doesn't exist.
- `--exoscale-availability-zone`: exoscale availability zone.
- `--exoscale-keypair`: exoscale keypair name.
If a custom security group is provided, you need to ensure that you allow TCP ports 22 and 2376 in an ingress rule.
Environment variables and default values:
| CLI option | Environment variable | Default |
|---------------------------------|------------------------------|------------------|
| **`--exoscale-url`** | `EXOSCALE_ENDPOINT` | - |
| **`--exoscale-api-key`** | `EXOSCALE_API_KEY` | - |
| **`--exoscale-api-secret-key`** | `EXOSCALE_API_SECRET` | - |
| `--exoscale-instance-profile` | `EXOSCALE_INSTANCE_PROFILE` | `small` |
| `--exoscale-disk-size` | `EXOSCALE_DISK_SIZE` | `50` |
| `--exoscale-image` | `EXSOCALE_IMAGE` | `ubuntu-14.04` |
| `--exoscale-security-group` | `EXOSCALE_SECURITY_GROUP` | `docker-machine` |
| `--exoscale-availability-zone` | `EXOSCALE_AVAILABILITY_ZONE` | `ch-gva-2` |
| `--exoscale-keypair` | `EXOSCALE_KEYPAIR` | - |
| CLI option | Environment variable | Default |
|---------------------------------|------------------------------|-----------------------------------|
| `--exoscale-url` | `EXOSCALE_ENDPOINT` | `https://api.exoscale.ch/compute` |
| **`--exoscale-api-key`** | `EXOSCALE_API_KEY` | - |
| **`--exoscale-api-secret-key`** | `EXOSCALE_API_SECRET` | - |
| `--exoscale-instance-profile` | `EXOSCALE_INSTANCE_PROFILE` | `small` |
| `--exoscale-disk-size` | `EXOSCALE_DISK_SIZE` | `50` |
| `--exoscale-image` | `EXSOCALE_IMAGE` | `ubuntu-14.04` |
| `--exoscale-security-group` | `EXOSCALE_SECURITY_GROUP` | `docker-machine` |
| `--exoscale-availability-zone` | `EXOSCALE_AVAILABILITY_ZONE` | `ch-gva-2` |
#### Generic
Create machines using an existing VM/Host with SSH.