summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictoria Bialas <victoria.bialas@docker.com>2016-09-23 13:37:50 -0700
committerVictoria Bialas <victoria.bialas@docker.com>2016-09-26 22:26:07 -0700
commit4b671ea1cb884d3d4251249156ea5e9b677b568d (patch)
treeed43c0e714ddfd241de54647061ee4917b2bcb5a
parentbdd3b24cdc80a65d0fb31d5fb5f2ec20318f365d (diff)
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>
-rw-r--r--docs/drivers/openstack.md5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/drivers/openstack.md b/docs/drivers/openstack.md
index be514ac..75fde14 100644
--- a/docs/drivers/openstack.md
+++ b/docs/drivers/openstack.md
@@ -18,10 +18,11 @@ Mandatory:
18- `--openstack-flavor-id` or `--openstack-flavor-name`: Identify the flavor that will be used for the machine. 18- `--openstack-flavor-id` or `--openstack-flavor-name`: Identify the flavor that will be used for the machine.
19- `--openstack-image-id` or `--openstack-image-name`: Identify the image that will be used for the machine. 19- `--openstack-image-id` or `--openstack-image-name`: Identify the image that will be used for the machine.
20 20
21## Usage
21 22
22 $ docker-machine create --driver openstack vm 23 $ docker-machine create --driver openstack vm
23 24
24Options: 25## Options
25 26
26- `--openstack-active-timeout`: The timeout in seconds until the OpenStack instance must be active. 27- `--openstack-active-timeout`: The timeout in seconds until the OpenStack instance must be active.
27- `--openstack-availability-zone`: The availability zone in which to launch the server. 28- `--openstack-availability-zone`: The availability zone in which to launch the server.
@@ -46,7 +47,7 @@ Options:
46- `--openstack-ssh-user`: The username to use for SSH into the machine. If not provided `root` will be used. 47- `--openstack-ssh-user`: The username to use for SSH into the machine. If not provided `root` will be used.
47- `--openstack-tenant-name` or `--openstack-tenant-id`: Identify the tenant in which the machine will be created. 48- `--openstack-tenant-name` or `--openstack-tenant-id`: Identify the tenant in which the machine will be created.
48 49
49Environment variables and default values: 50#### Environment variables and default values
50 51
51| CLI option | Environment variable | Default | 52| CLI option | Environment variable | Default |
52| ------------------------------- | ---------------------- | ----------- | 53| ------------------------------- | ---------------------- | ----------- |