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

Update documentation for adding parameter --openstacke-availability-zone 

Signed-off-by: Ling Fake <lingfake@huawei.com>
This commit is contained in:
LingFaKe 2015-06-05 18:57:54 -07:00 committed by Truman Ling
parent 30c2086cdf
commit a86a99648d
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
docs/index.md
View File

@ -1384,6 +1384,7 @@ Options:
- `--openstack-password`: User password. It can be omitted if the standard environment variable `OS_PASSWORD` is set. - `--openstack-password`: User password. It can be omitted if the standard environment variable `OS_PASSWORD` is set.
- `--openstack-tenant-name` or `--openstack-tenant-id`: Identify the tenant in which the machine will be created. - `--openstack-tenant-name` or `--openstack-tenant-id`: Identify the tenant in which the machine will be created.
- `--openstack-region`: The region to work on. Can be omitted if there is only one region on the OpenStack. - `--openstack-region`: The region to work on. Can be omitted if there is only one region on the OpenStack.
- `--openstack-availability-zone`: The availability zone in which to launch the server.
- `--openstack-endpoint-type`: Endpoint type can be `internalURL`, `adminURL` on `publicURL`. If is a helper for the driver - `--openstack-endpoint-type`: Endpoint type can be `internalURL`, `adminURL` on `publicURL`. If is a helper for the driver
to choose the right URL in the OpenStack service catalog. If not provided the default id `publicURL` to choose the right URL in the OpenStack service catalog. If not provided the default id `publicURL`
- `--openstack-net-name` or `--openstack-net-id`: Identify the private network the machine will be connected on. If your OpenStack project project contains only one private network it will be use automatically. - `--openstack-net-name` or `--openstack-net-id`: Identify the private network the machine will be connected on. If your OpenStack project project contains only one private network it will be use automatically.
@ -1397,28 +1398,29 @@ Options:
Environment variables and default values: Environment variables and default values:
| CLI option | Environment variable | Default | | CLI option | Environment variable | Default |
|-------------------------------|----------------------|---------| |----------------------------------|------------------------|---------|
| `--openstack-auth-url` | `OS_AUTH_URL` | - | | `--openstack-auth-url` | `OS_AUTH_URL` | - |
| `--openstack-flavor-name` | - | - | | `--openstack-flavor-name` | - | - |
| `--openstack-flavor-id` | - | - | | `--openstack-flavor-id` | - | - |
| `--openstack-image-name` | - | - | | `--openstack-image-name` | - | - |
| `--openstack-image-id` | - | - | | `--openstack-image-id` | - | - |
| `--openstack-insecure` | - | - | | `--openstack-insecure` | - | - |
| `--openstack-domain-name` | `OS_DOMAIN_NAME` | - | | `--openstack-domain-name` | `OS_DOMAIN_NAME` | - |
| `--openstack-domain-id` | `OS_DOMAIN_ID` | - | | `--openstack-domain-id` | `OS_DOMAIN_ID` | - |
| `--openstack-username` | `OS_USERNAME` | - | | `--openstack-username` | `OS_USERNAME` | - |
| `--openstack-password` | `OS_PASSWORD` | - | | `--openstack-password` | `OS_PASSWORD` | - |
| `--openstack-tenant-name` | `OS_TENANT_NAME` | - | | `--openstack-tenant-name` | `OS_TENANT_NAME` | - |
| `--openstack-tenant-id` | `OS_TENANT_ID` | - | | `--openstack-tenant-id` | `OS_TENANT_ID` | - |
| `--openstack-region` | `OS_REGION_NAME` | - | | `--openstack-region` | `OS_REGION_NAME` | - |
| `--openstack-endpoint-type` | `OS_ENDPOINT_TYPE` | - | | `--openstack-availability-zone` | `OS_AVAILABILITY_ZONE` | - |
| `--openstack-net-name` | - | - | | `--openstack-endpoint-type` | `OS_ENDPOINT_TYPE` | - |
| `--openstack-net-id` | - | - | | `--openstack-net-name` | - | - |
| `--openstack-sec-groups` | - | - | | `--openstack-net-id` | - | - |
| `--openstack-floatingip-pool` | - | - | | `--openstack-sec-groups` | - | - |
| `--openstack-ssh-user` | - | `root` | | `--openstack-floatingip-pool` | - | - |
| `--openstack-ssh-port` | - | `22` | | `--openstack-ssh-user` | - | `root` |
| `--openstack-ssh-port` | - | `22` |
#### Rackspace #### Rackspace
Create machines on [Rackspace cloud](http://www.rackspace.com/cloud) Create machines on [Rackspace cloud](http://www.rackspace.com/cloud)