From 4583fadd8a8b4ea3c8d97949021c51637ab33352 Mon Sep 17 00:00:00 2001 From: Fangfenghua <449171342@qq.com> Date: Tue, 31 Mar 2015 21:03:26 +0800 Subject: [PATCH] Update index.md Signed-off-by: Fang fenghua <449171342@qq.com> --- docs/index.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/index.md b/docs/index.md index aef1dd1f6c..0bf82c8db2 100644 --- a/docs/index.md +++ b/docs/index.md @@ -747,8 +747,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: @@ -759,8 +759,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 @@ -768,6 +767,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: