From 6ae39071767a2009d596cdb6d295f07ddcb604fa Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Wed, 17 Oct 2018 15:51:25 -0400 Subject: [PATCH] Document each libvirt.sysinfo_serial choice Change-Id: Ieb92bf388a141bbea314ff6dade84b2136c0784b --- nova/conf/libvirt.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nova/conf/libvirt.py b/nova/conf/libvirt.py index 7002be83fbf9..95c37d93ddbb 100644 --- a/nova/conf/libvirt.py +++ b/nova/conf/libvirt.py @@ -676,7 +676,18 @@ http://man7.org/linux/man-pages/man7/random.7.html. 'For example: x86_64=machinetype1,armv7l=machinetype2'), cfg.StrOpt('sysinfo_serial', default='auto', - choices=('none', 'os', 'hardware', 'auto'), + choices=( + ('none', 'A serial number entry is not added to the guest ' + 'domain xml.'), + ('os', 'A UUID serial number is generated from the host ' + '``/etc/machine-id`` file.'), + ('hardware', 'A UUID for the host hardware as reported by ' + 'libvirt. This is typically from the host ' + 'SMBIOS data, unless it has been overridden ' + 'in ``libvirtd.conf``.'), + ('auto', 'Uses the "os" source if possible, else ' + '"hardware".'), + ), help='The data source used to the populate the host "serial" ' 'UUID exposed to guest in the virtual BIOS.'), cfg.IntOpt('mem_stats_period_seconds',