openstack
/
tripleo-upgrade
Code Issues Proposed changes

Merge "Replace services-docker THT directory by services"

This commit is contained in:
Zuul 2020-08-12 09:29:09 +00:00 committed by Gerrit Code Review
parent d25409ee59 787ddc27e1
commit ef6e36e580
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/overcloud_upgrade_converge.sh.j2
View File

@ -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 -%}

2
templates/overcloud_upgrade_prepare.sh.j2
View File

@ -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 -%}