From a77cb28068ed0a960f3bd5d9e623a1b48a0340bb Mon Sep 17 00:00:00 2001 From: Jean-Laurent de Morlhon Date: Tue, 26 Jan 2016 10:57:53 +0100 Subject: [PATCH] Fix #2918 and match doc with current code Signed-off-by: Jean-Laurent de Morlhon --- docs/drivers/vsphere.md | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/docs/drivers/vsphere.md b/docs/drivers/vsphere.md index 9d838d7c29..0fc1eab0c2 100644 --- a/docs/drivers/vsphere.md +++ b/docs/drivers/vsphere.md @@ -14,18 +14,19 @@ Creates machines on a [VMware vSphere](http://www.vmware.com/products/vsphere) V Options: -- `--vmwarevsphere-cpu-count`: CPU number for Docker VM. -- `--vmwarevsphere-memory-size`: Size of memory for Docker VM (in MB). -- `--vmwarevsphere-boot2docker-url`: URL for boot2docker image. -- `--vmwarevsphere-vcenter`: IP/hostname for vCenter (or ESXi if connecting directly to a single host). -- `--vmwarevsphere-disk-size`: Size of disk for Docker VM (in MB). - `--vmwarevsphere-username`: **required** vSphere Username. - `--vmwarevsphere-password`: **required** vSphere Password. +- `--vmwarevsphere-cpu-count`: CPU number for Docker VM. +- `--vmwarevsphere-memory-size`: Size of memory for Docker VM (in MB). +- `--vmwarevsphere-disk-size`: Size of disk for Docker VM (in MB). +- `--vmwarevsphere-boot2docker-url`: URL for boot2docker image. +- `--vmwarevsphere-vcenter`: IP/hostname for vCenter (or ESXi if connecting directly to a single host). +- `--vmwarevsphere-vcenter-port`: vSphere Port for vCenter. - `--vmwarevsphere-network`: Network where the Docker VM will be attached. - `--vmwarevsphere-datastore`: Datastore for Docker VM. - `--vmwarevsphere-datacenter`: Datacenter for Docker VM (must be set to `ha-datacenter` when connecting to a single host). - `--vmwarevsphere-pool`: Resource pool for Docker VM. -- `--vmwarevsphere-compute-ip`: Compute host IP where the Docker VM will be instantiated. +- `--vmwarevsphere-hostsystem`: vSphere compute resource where the docker VM will be instantiated (use /* or / if using a cluster). The VMware vSphere driver uses the latest boot2docker image. @@ -33,15 +34,16 @@ Environment variables and default values: | CLI option | Environment variable | Default | | --------------------------------- | ------------------------- | ------------------------ | -| `--vmwarevsphere-cpu-count` | `VSPHERE_CPU_COUNT` | `2` | -| `--vmwarevsphere-memory-size` | `VSPHERE_MEMORY_SIZE` | `2048` | -| `--vmwarevsphere-disk-size` | `VSPHERE_DISK_SIZE` | `20000` | -| `--vmwarevsphere-boot2docker-url` | `VSPHERE_BOOT2DOCKER_URL` | _Latest boot2docker url_ | -| `--vmwarevsphere-vcenter` | `VSPHERE_VCENTER` | - | | **`--vmwarevsphere-username`** | `VSPHERE_USERNAME` | - | | **`--vmwarevsphere-password`** | `VSPHERE_PASSWORD` | - | +| `--vmwarevsphere-cpu-count` | `VSPHERE_CPU_COUNT` | `2` | +| `--vmwarevsphere-memory-size` | `VSPHERE_MEMORY_SIZE` | `2048` | +| `--vmwarevsphere-boot2docker-url` | `VSPHERE_BOOT2DOCKER_URL` | _Latest boot2docker url_ | +| `--vmwarevsphere-vcenter` | `VSPHERE_VCENTER` | - | +| `--vmwarevsphere-vcenter-port` | `VSPHERE_VCENTER_PORT` | 443 | +| `--vmwarevsphere-disk-size` | `VSPHERE_DISK_SIZE` | `20000` | | `--vmwarevsphere-network` | `VSPHERE_NETWORK` | - | | `--vmwarevsphere-datastore` | `VSPHERE_DATASTORE` | - | | `--vmwarevsphere-datacenter` | `VSPHERE_DATACENTER` | - | | `--vmwarevsphere-pool` | `VSPHERE_POOL` | - | -| `--vmwarevsphere-compute-ip` | `VSPHERE_COMPUTE_IP` | - | +| `--vmwarevsphere-hostsystem` | `VSPHERE_HOSTSYSTEM` | - | \ No newline at end of file