diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-09-18 23:15:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-09-18 23:15:54 +0000 |
| commit | d55f3b7c3373871d85ca87d853feee68ce2151e3 (patch) | |
| tree | 71787b390949eb3c7239e006caf1de59e0cdd11e | |
| parent | e79de9d696b8becbc16aecf5ac276bcaeb2036aa (diff) | |
| parent | b312b0ba5df09f985d7eaf69e7c71e4baac14675 (diff) | |
| download | nova-d55f3b7c3373871d85ca87d853feee68ce2151e3.tar.gz | |
Merge "Add Hyper-V driver in the "compute_driver" option description" into stable/havana
| -rw-r--r-- | etc/nova/nova.conf.sample | 4 | ||||
| -rw-r--r-- | nova/virt/driver.py | 3 | ||||
| -rw-r--r-- | nova/virt/hyperv/__init__.py | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample index 059b996ee5..ba916db0ba 100644 --- a/etc/nova/nova.conf.sample +++ b/etc/nova/nova.conf.sample @@ -1914,8 +1914,8 @@ # Driver to use for controlling virtualization. Options # include: libvirt.LibvirtDriver, xenapi.XenAPIDriver, # fake.FakeDriver, baremetal.BareMetalDriver, -# vmwareapi.VMwareESXDriver, vmwareapi.VMwareVCDriver (string -# value) +# vmwareapi.VMwareESXDriver, vmwareapi.VMwareVCDriver, +# hyperv.HyperVDriver (string value) #compute_driver=<None> # The default format an ephemeral_volume will be formatted diff --git a/nova/virt/driver.py b/nova/virt/driver.py index 75686bc7ed..da31f6b643 100644 --- a/nova/virt/driver.py +++ b/nova/virt/driver.py @@ -37,7 +37,8 @@ driver_opts = [ help='Driver to use for controlling virtualization. Options ' 'include: libvirt.LibvirtDriver, xenapi.XenAPIDriver, ' 'fake.FakeDriver, baremetal.BareMetalDriver, ' - 'vmwareapi.VMwareESXDriver, vmwareapi.VMwareVCDriver'), + 'vmwareapi.VMwareESXDriver, vmwareapi.VMwareVCDriver, ' + 'hyperv.HyperVDriver'), cfg.StrOpt('default_ephemeral_format', help='The default format an ephemeral_volume will be ' 'formatted with on creation.'), diff --git a/nova/virt/hyperv/__init__.py b/nova/virt/hyperv/__init__.py index 090fc0639e..0774b31a9b 100644 --- a/nova/virt/hyperv/__init__.py +++ b/nova/virt/hyperv/__init__.py @@ -14,3 +14,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. + +from nova.virt.hyperv import driver + +HyperVDriver = driver.HyperVDriver |