Merge "Config options: centralize section "scheduler""
This commit is contained in:
commit
453418b1bf
@ -14,16 +14,16 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo_config import cfg
|
|
||||||
from oslo_config import fixture as config_fixture
|
from oslo_config import fixture as config_fixture
|
||||||
from oslo_policy import opts as policy_opts
|
from oslo_policy import opts as policy_opts
|
||||||
|
|
||||||
|
import nova.conf
|
||||||
from nova import config
|
from nova import config
|
||||||
from nova import ipv6
|
from nova import ipv6
|
||||||
from nova import paths
|
from nova import paths
|
||||||
from nova.tests.unit import utils
|
from nova.tests.unit import utils
|
||||||
|
|
||||||
CONF = cfg.CONF
|
CONF = nova.conf.CONF
|
||||||
CONF.import_opt('use_ipv6', 'nova.netconf')
|
CONF.import_opt('use_ipv6', 'nova.netconf')
|
||||||
CONF.import_opt('host', 'nova.netconf')
|
CONF.import_opt('host', 'nova.netconf')
|
||||||
CONF.import_opt('fake_network', 'nova.network.linux_net')
|
CONF.import_opt('fake_network', 'nova.network.linux_net')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user