diff options
| author | Davanum Srinivas <dims@linux.vnet.ibm.com> | 2013-03-07 18:17:55 -0500 |
|---|---|---|
| committer | Davanum Srinivas <dims@linux.vnet.ibm.com> | 2013-03-07 18:17:55 -0500 |
| commit | 175dfc11007b5824d4fbdc2bf9eca696eff1f59d (patch) | |
| tree | 7749f7d62849fc4164c5586b42664991a8ab3b50 | |
| parent | e23769827dbd5c9eb9d392e6452ca33253f88329 (diff) | |
| download | nova-175dfc11007b5824d4fbdc2bf9eca696eff1f59d.tar.gz nova-175dfc11007b5824d4fbdc2bf9eca696eff1f59d.tar.xz nova-175dfc11007b5824d4fbdc2bf9eca696eff1f59d.zip | |
Fix for delete error in Hyper-V - missing CONF imports
Looks like we need to import the options explicitly
Fix for LP# 1140759
Change-Id: I21c09330c209f4e2178b6c0a6300944cd58d4423
| -rwxr-xr-x | nova/compute/manager.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index c4f3e1c6f..9d60ba965 100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -175,6 +175,8 @@ CONF.import_opt('allow_resize_to_same_host', 'nova.compute.api') CONF.import_opt('console_topic', 'nova.console.rpcapi') CONF.import_opt('host', 'nova.netconf') CONF.import_opt('my_ip', 'nova.netconf') +CONF.import_opt('vnc_enabled', 'nova.vnc') +CONF.import_opt('enabled', 'nova.spice', group='spice') QUOTAS = quota.QUOTAS |