From 9102f807e09508419d4c1cd356b22c7f3ca50b18 Mon Sep 17 00:00:00 2001 From: John Garbutt Date: Mon, 8 Oct 2012 16:46:39 +0100 Subject: [PATCH] Ensures compute_driver flag can be used by bdm Fixes bug 1063851 by moving compute_driver flag from compute/manager.py to the global flags.py Change-Id: I06891fd65550b63ffe83da18b6af41cf46938667 --- nova/compute/manager.py | 5 ----- nova/flags.py | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 920ed658b86..94ac8a225df 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -84,11 +84,6 @@ 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 e9057d8db40..396d441bf90 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -409,6 +409,11 @@ def _get_my_ip(): 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)