WIP: docs update for d4mac, d4win, Hyper-V driver and other virtualization factors, swarm mode

more updates to Machine docs for creating local VMsM

added details and example on using hyper-v driver, formatted headings for other driver docs

copyedits

incorporated Nathan's copyedits

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
This commit is contained in:
Victoria Bialas 2016-09-23 13:37:50 -07:00
parent bdd3b24cdc
commit 4b671ea1cb
1 changed files with 3 additions and 2 deletions

View File

@ -18,10 +18,11 @@ Mandatory:
- `--openstack-flavor-id` or `--openstack-flavor-name`: Identify the flavor that will be used for the machine.
- `--openstack-image-id` or `--openstack-image-name`: Identify the image that will be used for the machine.
## Usage
$ docker-machine create --driver openstack vm
Options:
## Options
- `--openstack-active-timeout`: The timeout in seconds until the OpenStack instance must be active.
- `--openstack-availability-zone`: The availability zone in which to launch the server.
@ -46,7 +47,7 @@ Options:
- `--openstack-ssh-user`: The username to use for SSH into the machine. If not provided `root` will be used.
- `--openstack-tenant-name` or `--openstack-tenant-id`: Identify the tenant in which the machine will be created.
Environment variables and default values:
#### Environment variables and default values
| CLI option | Environment variable | Default |
| ------------------------------- | ---------------------- | ----------- |