diff options
Diffstat (limited to 'apex')
-rw-r--r-- | apex/common/constants.py | 5 | ||||
-rw-r--r-- | apex/overcloud/deploy.py | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/apex/common/constants.py b/apex/common/constants.py index c3e3f5a0..5a2b7f98 100644 --- a/apex/common/constants.py +++ b/apex/common/constants.py @@ -39,10 +39,7 @@ VIRT_PW = '--root-password' THT_DIR = '/usr/share/openstack-tripleo-heat-templates' THT_ENV_DIR = os.path.join(THT_DIR, 'environments') -THT_DOCKER_ENV_DIR = { - 'master': os.path.join(THT_ENV_DIR, 'services'), - 'queens': os.path.join(THT_ENV_DIR, 'services') -} +THT_DOCKER_ENV_DIR = os.path.join(THT_ENV_DIR, 'services') DEFAULT_OS_VERSION = 'master' DEFAULT_ODL_VERSION = 'oxygen' diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py index 6e1d5bb4..4deeabff 100644 --- a/apex/overcloud/deploy.py +++ b/apex/overcloud/deploy.py @@ -152,7 +152,7 @@ def get_docker_sdn_files(ds_opts): :return: list of docker THT env files for an SDN """ docker_services = con.VALID_DOCKER_SERVICES - tht_dir = con.THT_DOCKER_ENV_DIR[ds_opts['os_version']] + tht_dir = con.THT_DOCKER_ENV_DIR sdn_env_list = build_sdn_env_list(ds_opts, SDN_FILE_MAP) for i, sdn_file in enumerate(sdn_env_list): sdn_base = os.path.basename(sdn_file) |