openstack/nova
Code Issues Proposed changes

Merge "conf: libvirt: Cleanup CPU modelling related options"

Browse Source
This commit is contained in:
Zuul
2017-12-21 21:56:03 +00:00
committed by Gerrit Code Review
parent e391e08563 07e989f12b
commit 0c97889799
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
nova/conf/libvirt.py
View File

@@ -488,16 +488,20 @@ default to "none".
Possible values: Possible values:
* ``host-model``: Clones the host CPU feature flags. * ``host-model``: Clones the host CPU feature flags
* ``host-passthrough``: Use the host CPU model exactly; * ``host-passthrough``: Use the host CPU model exactly
* ``custom``: Use a named CPU model; * ``custom``: Use a named CPU model
* ``none``: Not set any CPU model. * ``none``: Don't set a specific CPU model. For instances with
``virt_type`` as KVM/QEMU, the default CPU model from QEMU will be used,
which provides a basic set of CPU features that are compatible with most
hosts.
Related options: Related options:
* ``cpu_model``: If ``custom`` is used for ``cpu_mode``, set this config * ``cpu_model``: This should be set ONLY when ``cpu_mode`` is set to
option too, otherwise this would result in an error and the instance won't ``custom``. Otherwise, it would result in an error and the instance
be launched. launch will fail.
"""), """),
cfg.StrOpt('cpu_model', cfg.StrOpt('cpu_model',
help=""" help="""
@@ -505,12 +509,14 @@ Set the name of the libvirt CPU model the instance should use.
Possible values: Possible values:
* The names listed in /usr/share/libvirt/cpu_map.xml * The named CPU models listed in ``/usr/share/libvirt/cpu_map.xml``
Related options: Related options:
* ``cpu_mode``: Don't set this when ``cpu_mode`` is NOT set to ``custom``. * ``cpu_mode``: This should be set to ``custom`` ONLY when you want to
This would result in an error and the instance won't be launched. configure (via ``cpu_model``) a specific named CPU model. Otherwise, it
would result in an error and the instance launch will fail.
* ``virt_type``: Only the virtualization types ``kvm`` and ``qemu`` use this. * ``virt_type``: Only the virtualization types ``kvm`` and ``qemu`` use this.
"""), """),
cfg.StrOpt('snapshots_directory', cfg.StrOpt('snapshots_directory',