diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-05 13:54:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-05 13:54:58 +0000 |
| commit | 6a6c750f6d408be05c5791bc5e546b74797bb63f (patch) | |
| tree | cf06c55fdd926b52dd3d4a26c938ab0bbe787895 | |
| parent | 1a83c02299dc9331ec5e973145ff22ebb6efcd22 (diff) | |
| parent | 8cafe0d0ea42ce7d722d8a48371cc560d458b14e (diff) | |
| download | nova-6a6c750f6d408be05c5791bc5e546b74797bb63f.tar.gz nova-6a6c750f6d408be05c5791bc5e546b74797bb63f.tar.xz nova-6a6c750f6d408be05c5791bc5e546b74797bb63f.zip | |
Merge "Rename VMWare to VMware"
| -rw-r--r-- | README.rst | 2 | ||||
| -rwxr-xr-x | nova/virt/driver.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/README.rst b/README.rst index 43f6b9d51..8e50b4584 100644 --- a/README.rst +++ b/README.rst @@ -3,7 +3,7 @@ OpenStack Nova README OpenStack Nova provides a cloud computing fabric controller, supporting a wide variety of virtualization technologies, -including KVM, Xen, LXC, VMWare, and more. In addition to +including KVM, Xen, LXC, VMware, and more. In addition to its native API, it includes compatibility with the commonly encountered Amazon EC2 and S3 APIs. diff --git a/nova/virt/driver.py b/nova/virt/driver.py index bc53aa88a..11c65519c 100755 --- a/nova/virt/driver.py +++ b/nova/virt/driver.py @@ -36,7 +36,7 @@ driver_opts = [ help='Driver to use for controlling virtualization. Options ' 'include: libvirt.LibvirtDriver, xenapi.XenAPIDriver, ' 'fake.FakeDriver, baremetal.BareMetalDriver, ' - 'vmwareapi.VMWareESXDriver'), + 'vmwareapi.VMwareESXDriver, vmwareapi.VMwareVCDriver'), cfg.StrOpt('default_ephemeral_format', default=None, help='The default format an ephemeral_volume will be ' |