summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nova/compute/manager.py5
-rw-r--r--nova/flags.py5
2 files changed, 5 insertions, 5 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 24a040d7e..4a40c9f42 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -85,11 +85,6 @@ compute_opts = [
help="Where cached images are stored under $instances_path."
"This is NOT the full path - just a folder name."
"For per-compute-host cached images, set to _base_$my_ip"),
- cfg.StrOpt('compute_driver',
- help='Driver to use for controlling virtualization. Options '
- 'include: libvirt.LibvirtDriver, xenapi.XenAPIDriver, '
- 'fake.FakeDriver, baremetal.BareMetalDriver, '
- 'vmwareapi.VMWareESXDriver'),
cfg.StrOpt('console_host',
default=socket.getfqdn(),
help='Console proxy host to use to connect '
diff --git a/nova/flags.py b/nova/flags.py
index 03e607c02..7d09915a5 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -387,6 +387,11 @@ global_opts = [
help='Whether to batch up the application of IPTables rules'
' during a host restart and apply all at the end of the'
' init phase'),
+ cfg.StrOpt('compute_driver',
+ help='Driver to use for controlling virtualization. Options '
+ 'include: libvirt.LibvirtDriver, xenapi.XenAPIDriver, '
+ 'fake.FakeDriver, baremetal.BareMetalDriver, '
+ 'vmwareapi.VMWareESXDriver'),
]
FLAGS.register_opts(global_opts)