Merge all configs of devstack_docker.py into devstack.py
This commit is contained in:
@@ -23,10 +23,7 @@ import os
|
||||
|
||||
########################## Devstack settings ###################################
|
||||
|
||||
if 'BOK_CHOY_HOSTNAME' in os.environ:
|
||||
from .devstack_docker import * # pylint: disable=wildcard-import, unused-wildcard-import
|
||||
else:
|
||||
from .devstack import * # pylint: disable=wildcard-import
|
||||
from .devstack import * # pylint: disable=wildcard-import
|
||||
|
||||
TEST_ROOT = REPO_ROOT / "test_root"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user