diff options
| author | John Garbutt <john.garbutt@citrix.com> | 2012-10-08 16:46:39 +0100 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2012-10-29 12:58:46 -0700 |
| commit | 9102f807e09508419d4c1cd356b22c7f3ca50b18 (patch) | |
| tree | c48b6b967d73e4124f0bd615078fa410fe2cd0bf | |
| parent | 9d4ecc2c553b85f2fccf444498df15b09b6fe54b (diff) | |
| download | nova-9102f807e09508419d4c1cd356b22c7f3ca50b18.tar.gz nova-9102f807e09508419d4c1cd356b22c7f3ca50b18.tar.xz nova-9102f807e09508419d4c1cd356b22c7f3ca50b18.zip | |
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
| -rw-r--r-- | nova/compute/manager.py | 5 | ||||
| -rw-r--r-- | nova/flags.py | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 920ed658b..94ac8a225 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -84,11 +84,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 e9057d8db..396d441bf 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -409,6 +409,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) |