diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-29 10:07:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-29 10:07:58 +0000 |
| commit | 34efd5db9f382e2e252ae119f8ccfbb11a52ad14 (patch) | |
| tree | 5094c4372edd173cee4125856c4804bf074c9b86 | |
| parent | 8a92af1e84ee7d6f623f677263f9fa5b9487253d (diff) | |
| parent | fa5079c257c00b8b56138233aca5755c54db9143 (diff) | |
| download | nova-34efd5db9f382e2e252ae119f8ccfbb11a52ad14.tar.gz nova-34efd5db9f382e2e252ae119f8ccfbb11a52ad14.tar.xz nova-34efd5db9f382e2e252ae119f8ccfbb11a52ad14.zip | |
Merge "Verify that CONF.compute_driver is defined"
| -rwxr-xr-x | nova/virt/driver.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/driver.py b/nova/virt/driver.py index d0a670a3e..93bff1ff4 100755 --- a/nova/virt/driver.py +++ b/nova/virt/driver.py @@ -964,4 +964,4 @@ def load_compute_driver(virtapi, compute_driver=None): def compute_driver_matches(match): - return CONF.compute_driver.endswith(match) + return CONF.compute_driver and CONF.compute_driver.endswith(match) |