openstack/tripleo-upgrade
Code Issues Proposed changes

Merge "Handle upgrade_prepare_extra_params as comma-separated string."

Browse Source
This commit is contained in:
Zuul 2019-10-14 13:28:00 +00:00 committed by Gerrit Code Review
commit 21463a7536
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/overcloud_upgrade_prepare.sh.j2
View File

@ -50,7 +50,11 @@ openstack overcloud{% if ffu_overcloud_upgrade %} ffwd-upgrade {% else %} upgrad
-e {{ tht_directory }}/environments/services/neutron-ovs.yaml \ -e {{ tht_directory }}/environments/services/neutron-ovs.yaml \
{% endif -%} {% endif -%}
{% if upgrade_prepare_extra_params and upgrade_prepare_extra_params|string -%} {% if upgrade_prepare_extra_params and upgrade_prepare_extra_params|string -%}
{% if ',' in upgrade_prepare_extra_params -%}
-e {{ upgrade_prepare_extra_params.split(',') | join(' -e ') }} \
{% else -%}
-e {{ upgrade_prepare_extra_params }} \ -e {{ upgrade_prepare_extra_params }} \
{% endif -%}
{% elif upgrade_prepare_extra_params and upgrade_prepare_extra_params|list -%} {% elif upgrade_prepare_extra_params and upgrade_prepare_extra_params|list -%}
-e {{ upgrade_prepare_extra_params | join(' -e ') }} \ -e {{ upgrade_prepare_extra_params | join(' -e ') }} \
{% endif -%} {% endif -%}