diff options
Diffstat (limited to 'apex/overcloud/deploy.py')
| -rw-r--r-- | apex/overcloud/deploy.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py index 03e56529..6b7c2db0 100644 --- a/apex/overcloud/deploy.py +++ b/apex/overcloud/deploy.py @@ -144,15 +144,16 @@ def get_docker_sdn_file(ds_opts): """ # FIXME(trozet): We assume right now there is only one docker SDN file docker_services = con.VALID_DOCKER_SERVICES + tht_dir = con.THT_DOCKER_ENV_DIR[ds_opts['os_version']] sdn_env_list = build_sdn_env_list(ds_opts, SDN_FILE_MAP) for sdn_file in sdn_env_list: sdn_base = os.path.basename(sdn_file) if sdn_base in docker_services: if docker_services[sdn_base] is not None: - return os.path.join(con.THT_DOCKER_ENV_DIR, + return os.path.join(tht_dir, docker_services[sdn_base]) else: - return os.path.join(con.THT_DOCKER_ENV_DIR, sdn_base) + return os.path.join(tht_dir, sdn_base) def create_deploy_cmd(ds, ns, inv, tmp_dir, @@ -430,7 +431,6 @@ def prep_image(ds, ns, img, tmp_dir, root_pw=None, docker_tag=None, {con.VIRT_UPLOAD: "{}:/usr/lib/systemd/system/".format(tmp_losetup) }, {con.VIRT_RUN_CMD: 'truncate /srv/data.img --size 10G'}, - {con.VIRT_RUN_CMD: 'mkfs.ext4 -F /srv/data.img'}, {con.VIRT_RUN_CMD: 'systemctl daemon-reload'}, {con.VIRT_RUN_CMD: 'systemctl enable losetup.service'}, ]) |