diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-08 23:13:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-08 23:13:08 +0000 |
| commit | 7e96d76d762a67e534d769bc3e4e48adb56a130e (patch) | |
| tree | 75f9c6b765ec9fa1485d889f596a6db99eb1f4d9 | |
| parent | 24604a9a3682c96ef980972e6216a4da5c7f7658 (diff) | |
| parent | 175dfc11007b5824d4fbdc2bf9eca696eff1f59d (diff) | |
| download | nova-7e96d76d762a67e534d769bc3e4e48adb56a130e.tar.gz nova-7e96d76d762a67e534d769bc3e4e48adb56a130e.tar.xz nova-7e96d76d762a67e534d769bc3e4e48adb56a130e.zip | |
Merge "Fix for delete error in Hyper-V - missing CONF imports"
| -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 7a9d4e6a7..338708f4e 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 |