From 58744bfd1cd28cb0e7b1fb6b63ea106488415099 Mon Sep 17 00:00:00 2001 From: space Date: Fri, 21 Apr 2017 05:20:53 -0400 Subject: [PATCH] Modify the description of flat_injected in nova.conf This patch modifies the description of flat_injected in nova.conf to make it more accurate. Because the libvirt virt driver also use it when someone use config_drive to configure the network. Change-Id: If97be7ee9853d9095d8eb92929d4bc49e5a040da --- nova/conf/network.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nova/conf/network.py b/nova/conf/network.py index 0ff401a243..36261be0d5 100644 --- a/nova/conf/network.py +++ b/nova/conf/network.py @@ -36,7 +36,8 @@ Enable neutron as the backend for networking. Determine whether to use Neutron or Nova Network as the back end. Set to true to use neutron. """), - # TODO(sfinucan): This option is tied into the XenAPI and VMWare drivers. + # TODO(sfinucan): This option is tied into the XenAPI, VMWare and Libvirt + # drivers. # We should remove this dependency by either adding a new opt for each # driver or simply removing the offending code. Until then we cannot # deprecate this option. @@ -44,8 +45,10 @@ to use neutron. default=False, help=""" This option determines whether the network setup information is injected into -the VM before it is booted. While it was originally designed to be used only by -nova-network, it is also used by the vmware and xenapi virt drivers to control +the VM before it is booted. While it was originally designed to be used only +by nova-network, it is also used by the vmware and xenapi virt drivers to +control whether network information is injected into a VM. The libvirt virt +driver also uses it when we use config_drive to configure network to control whether network information is injected into a VM. """), cfg.StrOpt("flat_network_bridge",