Merge "Fix for delete error in Hyper-V - missing CONF imports"

2013-03-08 23:13:08 +00:00
parent 24604a9a36 175dfc1100
commit 7e96d76d76
1 changed files with 2 additions and 0 deletions
@@ -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