openstack/tripleo-upgrade
Code Issues Proposed changes

Merge "Drop remaining ssh-user from templates."

Browse Source
This commit is contained in:
Zuul 2018-11-23 18:15:56 +00:00 committed by Gerrit Code Review
commit c98618bfbe
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
templates/overcloud_update_run.sh.j2
View File

@ -16,9 +16,6 @@ openstack overcloud update run \
{% if tripleo_upgrade_debug|bool %} {% if tripleo_upgrade_debug|bool %}
--debug \ --debug \
{% endif %} {% endif %}
{% if overcloud_ssh_user %}
--ssh-user {{ overcloud_ssh_user }} \
{% endif %}
--nodes {{ item }} --playbook {{ playbook }} 2>&1 --nodes {{ item }} --playbook {{ playbook }} 2>&1
{%- endfor -%} {%- endfor -%}
@ -31,9 +28,6 @@ openstack overcloud update run \
{% if tripleo_upgrade_debug|bool %} {% if tripleo_upgrade_debug|bool %}
--debug \ --debug \
{% endif %} {% endif %}
{% if overcloud_ssh_user %}
--ssh-user {{ overcloud_ssh_user }} \
{% endif %}
--nodes {{ item }} --playbook all 2>&1 --nodes {{ item }} --playbook all 2>&1
{% endif %} {% endif %}

3
templates/overcloud_upgrade_run.sh.j2
View File

@ -93,9 +93,6 @@ openstack overcloud upgrade run \
{% if tripleo_upgrade_debug|bool %} {% if tripleo_upgrade_debug|bool %}
--debug \ --debug \
{% endif -%} {% endif -%}
{% if overcloud_ssh_user -%}
--ssh-user {{ overcloud_ssh_user }} \
{% endif -%}
--roles {{ item }} --playbook all 2>&1 --roles {{ item }} --playbook all 2>&1
echo "[$(date)] Finished major upgrade for {{ item }} role" echo "[$(date)] Finished major upgrade for {{ item }} role"