From 27fcf2a6cf9e28308140ea8d378f0ae83527cd61 Mon Sep 17 00:00:00 2001
From: Hieu LE <hieulq@vn.fujitsu.com>
Date: Fri, 22 Apr 2016 14:28:18 +0700
Subject: [PATCH] Config options: centralize utils libvirt options (5)

The config options of the "nova.conf" section "libvirt" got
moved to the new central location "nova/conf/libvirt.py".
Subsequent patches will then move another options in libvirt section.
This is the 5th patch in a long-chain patchs.

Change-Id: Iba3a4a487b73eb09fe67988e614c4811514e932f
Co-Authored-by: Markus Zoeller <mzoeller@de.ibm.com>
Implements: blueprint centralize-config-options-newton
---
 nova/conf/libvirt.py       | 8 ++++++++
 nova/virt/libvirt/utils.py | 9 ---------
 nova/virt/opts.py          | 2 --
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/nova/conf/libvirt.py b/nova/conf/libvirt.py
index 05334c1b29..bcdf63bf98 100644
--- a/nova/conf/libvirt.py
+++ b/nova/conf/libvirt.py
@@ -277,11 +277,19 @@ libvirt_lvm_opts = [
                help='Size in MiB to wipe at start of old volumes. 0 => all'),
 ]
 
+libvirt_utils_opts = [
+    cfg.BoolOpt('snapshot_compression',
+                default=False,
+                help='Compress snapshot images when possible. This '
+                     'currently applies exclusively to qcow2 images'),
+]
+
 ALL_OPTS = list(itertools.chain(
     libvirt_general_opts,
     libvirt_imagebackend_opts,
     libvirt_imagecache_opts,
     libvirt_lvm_opts,
+    libvirt_utils_opts,
 ))
 
 
diff --git a/nova/virt/libvirt/utils.py b/nova/virt/libvirt/utils.py
index 14280e8aa3..dba99a9d5b 100644
--- a/nova/virt/libvirt/utils.py
+++ b/nova/virt/libvirt/utils.py
@@ -24,7 +24,6 @@ import re
 
 from lxml import etree
 from oslo_concurrency import processutils
-from oslo_config import cfg
 from oslo_log import log as logging
 
 from nova.compute import arch
@@ -38,15 +37,7 @@ from nova.virt.libvirt import config as vconfig
 from nova.virt.libvirt.volume import remotefs
 from nova.virt import volumeutils
 
-libvirt_opts = [
-    cfg.BoolOpt('snapshot_compression',
-                default=False,
-                help='Compress snapshot images when possible. This '
-                     'currently applies exclusively to qcow2 images'),
-    ]
-
 CONF = nova.conf.CONF
-CONF.register_opts(libvirt_opts, 'libvirt')
 LOG = logging.getLogger(__name__)
 
 RESIZE_SNAPSHOT_NAME = 'nova-resize'
diff --git a/nova/virt/opts.py b/nova/virt/opts.py
index 4dd334b410..6f7fc5e279 100644
--- a/nova/virt/opts.py
+++ b/nova/virt/opts.py
@@ -12,7 +12,6 @@
 
 import itertools
 
-import nova.virt.libvirt.utils
 import nova.virt.libvirt.vif
 import nova.virt.libvirt.volume.aoe
 import nova.virt.libvirt.volume.glusterfs
@@ -36,7 +35,6 @@ def list_opts():
     return [
         ('libvirt',
          itertools.chain(
-             nova.virt.libvirt.utils.libvirt_opts,
              nova.virt.libvirt.vif.libvirt_vif_opts,
              nova.virt.libvirt.volume.volume.volume_opts,
              nova.virt.libvirt.volume.aoe.volume_opts,