Merge "Switch from FLAGS to CONF in tests"

This commit is contained in:
Jenkins
2012-11-12 14:56:05 +00:00
committed by Gerrit Code Review
17 changed files with 142 additions and 153 deletions

View File

@@ -30,8 +30,6 @@ from nova.openstack.common import timeutils
from nova import test
from nova import utils
FLAGS = flags.FLAGS
CONF = config.CONF
CONF.import_opt('reserved_host_memory_mb', 'nova.compute.resource_tracker')
CONF.import_opt('reserved_host_disk_mb', 'nova.compute.resource_tracker')