diff options
| author | Alin Gabriel Serdean <aserdean@cloudbasesolutions.com> | 2014-07-23 09:16:09 -0700 |
|---|---|---|
| committer | Alessandro Pilotti <apilotti@cloudbasesolutions.com> | 2014-09-17 16:07:29 +0300 |
| commit | b312b0ba5df09f985d7eaf69e7c71e4baac14675 (patch) | |
| tree | 83b7f18c4bbca9e2d9963a13297705c37590e259 | |
| parent | f8af69ab0aa2633406a2403ea6b4acd05c0ade2e (diff) | |
| download | nova-b312b0ba5df09f985d7eaf69e7c71e4baac14675.tar.gz | |
Add Hyper-V driver in the "compute_driver" option description
The description of the option "compute_driver" should include
hyperv.HyperVDriver along with the other supported driver.
Conflicts:
nova/virt/driver.py
nova/virt/hyperv/__init__.py
Closes-bug: #1347777
(cherry picked from commit b856bc5e348cc69923e3ee815303804323730026)
Change-Id: Ic7e16fd5154609987b2ef0b6f8ee52619ccf489c
| -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 973b9037f5..582d5dedb2 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 |