From 6d706e7a43538756a029a175235d1de1ff0de8b1 Mon Sep 17 00:00:00 2001
From: Stephen Gordon <sgordon@redhat.com>
Date: Thu, 21 Nov 2013 23:26:49 -0500
Subject: [PATCH] Move libvirt flags to libvirt group (cont.)

Following Michael's progress on blueprint libvirt-opts-group:

* Rename libvirt_type virt_type and move to libvirt group.
* Rename libvirt_uri conn_uri and move to libvirt group.

Move to libvirt group:

* libvirt_inject_password
* libvirt_inject_key
* libvirt_inject_partition
* libvirt_vif_driver
* libvirt_volume_drivers
* libvirt_disk_prefix
* libvirt_wait_soft_reboot_seconds
* libvirt_non_blocking
* libvirt_cpu_mode
* libvirt_cpu_model
* libvirt_snapshots_directory

Move libvirt_nonblocking to libvirt group and rename to
libvirt_non_blocking, correcting typo. Changes will be picked
up in output next time docs autoconfig is run.

Change-Id: Idbaa7d6c7ab3c4c2df56d0ad995214902fe6c115
Closes-Bug: #1253812
---
 .../flagmappings/nova.flagmappings            | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/autogenerate-config-docs/flagmappings/nova.flagmappings b/autogenerate-config-docs/flagmappings/nova.flagmappings
index 4f34c3d2..3c0240cf 100644
--- a/autogenerate-config-docs/flagmappings/nova.flagmappings
+++ b/autogenerate-config-docs/flagmappings/nova.flagmappings
@@ -71,6 +71,7 @@ config_drive_tempdir configdrive
 connection_trace db
 console upgrade_levels
 connection db
+conn_uri libvirt
 console_driver xen
 connection_debug db
 console_host compute
@@ -243,29 +244,27 @@ ldap_dns_soa_refresh ldap
 ldap_dns_soa_retry ldap
 ldap_dns_url ldap
 ldap_dns_user ldap
-libvirt_cpu_mode hypervisor
-libvirt_cpu_model hypervisor
-libvirt_disk_prefix hypervisor
+libvirt_cpu_mode libvirt
+libvirt_cpu_model libvirt
+libvirt_disk_prefix libvirt
 libvirt_images_rbd_ceph_conf hypervisor
 libvirt_images_type hypervisor
 libvirt_images_rbd_pool hypervisor
 libvirt_images_volume_group hypervisor
-libvirt_inject_key hypervisor
-libvirt_inject_partition hypervisor
-libvirt_inject_password hypervisor
+libvirt_inject_key libvirt
+libvirt_inject_partition libvirt
+libvirt_inject_password libvirt
 libvirt_iscsi_use_multipath hypervisor
 libvirt_iser_use_multipath hypervisor
 libvirt_lvm_snapshot_size hypervisor
-libvirt_nonblocking hypervisor
+libvirt_non_blocking libvirt
 libvirt_snapshot_compression hypervisor
-libvirt_snapshots_directory hypervisor
+libvirt_snapshots_directory libvirt
 libvirt_sparse_logical_volumes hypervisor
-libvirt_type hypervisor
-libvirt_uri hypervisor
 libvirt_use_virtio_for_bridges hypervisor
-libvirt_vif_driver hypervisor
-libvirt_volume_drivers hypervisor
-libvirt_wait_soft_reboot_seconds hypervisor
+libvirt_vif_driver libvirt
+libvirt_volume_drivers libvirt
+libvirt_wait_soft_reboot_seconds libvirt
 limit_cpu_features hyperv
 linuxnet_interface_driver network
 linuxnet_ovs_integration_bridge network
@@ -574,6 +573,7 @@ verbose logging
 vendordata_jsonfile_path metadata
 vif_driver baremetal
 virt_mkfs hypervisor
+virt_type libvirt
 virtual_power_host_key baremetal
 virtual_power_host_pass baremetal
 virtual_power_host_user baremetal