From 787ddc27e197012327f7ba9c033f617ccac55bae Mon Sep 17 00:00:00 2001 From: Eduardo Olivares Date: Tue, 11 Aug 2020 12:13:25 +0200 Subject: [PATCH] Replace services-docker THT directory by services Some earlier releases of THT include the following different directories with environment yaml files: services-docker and services In later THT releases, services-docker directory was removed and only services is available Due to that, services-docker needs to be replaced by services from the environment files path Change-Id: Ic197e0936d4d4b203db0b05c5446ba93d3d20095 --- templates/overcloud_upgrade_converge.sh.j2 | 2 +- templates/overcloud_upgrade_prepare.sh.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/overcloud_upgrade_converge.sh.j2 b/templates/overcloud_upgrade_converge.sh.j2 index f40a556c..6c6e15c8 100644 --- a/templates/overcloud_upgrade_converge.sh.j2 +++ b/templates/overcloud_upgrade_converge.sh.j2 @@ -55,7 +55,7 @@ openstack overcloud upgrade converge ${CONVERGE_ANSWER} \ {% endif -%} {% if initial_env_file is defined and initial_env_file.stdout_lines|length > 0 -%} {% for _env in initial_env_file.stdout_lines|difference(old_img|default([])) -%} - -e {{ _env }} \ + -e {{ _env | replace('services-docker', 'services') }} \ {% endfor -%} {% endif -%} {% if ffu_overcloud_upgrade and deployment_with_ha_upstream -%} diff --git a/templates/overcloud_upgrade_prepare.sh.j2 b/templates/overcloud_upgrade_prepare.sh.j2 index e3d113d9..4bfe4d65 100644 --- a/templates/overcloud_upgrade_prepare.sh.j2 +++ b/templates/overcloud_upgrade_prepare.sh.j2 @@ -34,7 +34,7 @@ openstack overcloud upgrade prepare ${PREPARE_ANSWER} \ {% endif -%} {% if initial_env_file is defined and initial_env_file.stdout_lines|length > 0 -%} {% for _env in initial_env_file.stdout_lines|difference(old_img|default([])) -%} - -e {{ _env }} \ + -e {{ _env | replace('services-docker', 'services') }} \ {% endfor -%} {% endif -%} {% if ffu_overcloud_upgrade and deployment_with_ha_upstream -%}