docs/how_to/hypervisors/vsphere.md in beaker-3.14.0 vs docs/how_to/hypervisors/vsphere.md in beaker-3.15.0

- old
+ new

@@ -8,19 +8,21 @@ :vsphere_username: 'joe' :vsphere_password: 'MyP@$$w0rd' These follow the conventions used by Cloud Provisioner and Fog. +>Note: Your fog credential file location may be specified in the 'CONFIG' section using the 'dot_fog' setting + There are two possible `hypervisor` hypervisor-types to use for vSphere testing, `vsphere` and `vcloud`. ### `hypervisor: vsphere` This option locates an existing static VM, optionally reverts it to a pre-existing snapshot, and runs tests on it. ### `hypervisor: vcloud` This option clones a new VM from a pre-existing template, runs tests on the newly-provisioned clone, then deletes the clone once testing completes. -The `vcloud` option requires a slightly-modified test configuration file, specifying both the target template as well as three additional parameters in the 'CONFIG' section ('datastore', 'resourcepool', and 'folder'). +The `vcloud` option requires a slightly-modified test configuration file, specifying both the target template as well as three additional parameters in the 'CONFIG' section ('datastore', 'datacenter', and 'folder'). Optionally, a resourcepool may be specified via the 'resourcepool' setting in the 'CONFIG' section. Template can be expressed in the 'HOSTS' section, or you can set the template to be used via the `BEAKER_vcloud_template` environment variable. #### example vcloud hosts file ### HOSTS: master-vm: roles: @@ -36,8 +38,9 @@ platform: ubuntu-10.04-i386 template: ubuntu-1004-i386 hypervisor: vcloud CONFIG: consoleport: 443 + datacenter: testdc datastore: instance0 resourcepool: Delivery/Quality Assurance/FOSS/Dynamic folder: delivery/Quality Assurance/FOSS/Dynamic