openstack
/
tripleo-upgrade
Code Issues Proposed changes

Merge "FFWD2: cleanup converge"

This commit is contained in:
Zuul 2020-10-24 01:15:12 +00:00 committed by Gerrit Code Review
parent 1d460e517a e9fcfeb4aa
commit f838aa89a9
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
templates/overcloud_upgrade_converge.sh.j2
View File

@ -64,9 +64,6 @@ openstack overcloud upgrade converge ${CONVERGE_ANSWER} \
{% if cli_converted_options|default(false)|bool -%}
-e {{working_dir}}/cli_opts_params.yaml \
{% endif -%}
{% if ffu_overcloud_upgrade -%}
-e {{ working_dir }}/{{ container_registry_file }} \
{% endif -%}
-e {{ working_dir }}/{{ uc_containers_prepare_file }} \
{% if (not ffu_overcloud_upgrade or roles_data != default_roles_data) %}--roles-file {{ roles_data }}{% endif %} 2>&1