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

Merge pull request #932 from Fangfenghua/patch-6 

Update index.md
This commit is contained in:
Evan Hazlett 2015-04-10 09:21:23 -04:00
parent 2ccf832c4d 4583fadd8a
commit bb08fcfbf9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/index.md
View File

@ -761,8 +761,8 @@ Create machines on [Openstack](http://www.openstack.org/software/)
Mandatory:
- `--openstack-flavor-id`: The flavor ID to use when creating the machine
- `--openstack-image-id`: The image ID to use when creating the machine.
- `--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.
Options:
@ -773,8 +773,7 @@ Options:
- `--openstack-region`: The region to work on. Can be omitted if there is ony one region on the OpenStack.
- `--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`
- `--openstack-net-id`: The private network id the machine will be connected on. If your OpenStack project project
contains only one private network it will be use automatically.
- `--openstack-net-id` or `--openstack-net-name`: 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-sec-groups`: If security groups are available on your OpenStack you can specify a comma separated list
to use for the machine (e.g. `secgrp001,secgrp002`).
- `--openstack-floatingip-pool`: The IP pool that will be used to get a public IP an assign it to the machine. If there is an
@ -782,6 +781,7 @@ Options:
there is no IP address already allocated a new IP will be allocated and assigned to the machine.
- `--openstack-ssh-user`: The username to use for SSH into the machine. If not provided `root` will be used.
- `--openstack-ssh-port`: Customize the SSH port if the SSH server on the machine does not listen on the default port.
- `--openstack-insecure`: Explicitly allow openstack driver to perform "insecure" SSL (https) requests. The server's certificate will not be verified against any certificate authorities. This option should be used with caution.
Environment variables: