From 8d760881378b7b4192d5d36f178caa68f41f151f Mon Sep 17 00:00:00 2001 From: ramishra Date: Thu, 18 Mar 2021 10:39:02 +0530 Subject: [PATCH] Fix make_config_download_dir() Uses the correct new config-download directory and links the existing to new, to keep the git history. Change-Id: I5fc78158bbff468576eaddf1924e67a6666213e3 --- tripleoclient/workflows/deployment.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tripleoclient/workflows/deployment.py b/tripleoclient/workflows/deployment.py index 1a9fb8002..537e0e9fa 100644 --- a/tripleoclient/workflows/deployment.py +++ b/tripleoclient/workflows/deployment.py @@ -521,9 +521,13 @@ def make_config_download_dir(config_download_dir, stack): # Symlink for the previous default config-download dir to the # new consistent location. # This will create the following symlink: - # ~/config-download -> - # ~/overcloud-deploy//config-download - config_download_stack_dir = \ + # ~/config-download/ -> + # ~/overcloud-deploy-/config-download/ + old_config_download_stack_dir = \ os.path.join(DEFAULT_WORK_DIR, stack) - if not os.path.exists(config_download_stack_dir): - os.symlink(config_download_dir, config_download_stack_dir) + config_download_stack_dir = \ + os.path.join(config_download_dir, stack) + if (not os.path.exists(config_download_stack_dir) and + os.path.exists(old_config_download_stack_dir)): + os.symlink(old_config_download_stack_dir, + config_download_stack_dir)