From 2fd1b262f93b67a7f8a34d519af729a0e87a22e9 Mon Sep 17 00:00:00 2001
From: Yurii Prokulevych <yprokule@redhat.com>
Date: Tue, 13 Nov 2018 07:42:28 +0100
Subject: [PATCH] Drop remaining ssh-user from templates.

`--ssh-user SSH_USER` option is deprecated and shoudn't be used
during Q->R upgrade, though it's still used during
 `prepare/converge` calls.

Change-Id: Icd862937205286707e8587fb5a25878c1a3d22af
---
 templates/overcloud_update_run.sh.j2  | 6 ------
 templates/overcloud_upgrade_run.sh.j2 | 3 ---
 2 files changed, 9 deletions(-)

diff --git a/templates/overcloud_update_run.sh.j2 b/templates/overcloud_update_run.sh.j2
index f2609bb3..ee55d0fd 100644
--- a/templates/overcloud_update_run.sh.j2
+++ b/templates/overcloud_update_run.sh.j2
@@ -16,9 +16,6 @@ openstack overcloud update run \
     {% if tripleo_upgrade_debug|bool %}
     --debug \
     {% endif %}
-    {% if overcloud_ssh_user %}
-    --ssh-user {{ overcloud_ssh_user }} \
-    {% endif %}
     --nodes {{ item }} --playbook {{ playbook }} 2>&1
 
     {%- endfor -%}
@@ -31,9 +28,6 @@ openstack overcloud update run \
     {% if tripleo_upgrade_debug|bool %}
     --debug \
     {% endif %}
-    {% if overcloud_ssh_user %}
-    --ssh-user {{ overcloud_ssh_user }} \
-    {% endif %}
     --nodes {{ item }} --playbook all 2>&1
 
 {% endif %}
diff --git a/templates/overcloud_upgrade_run.sh.j2 b/templates/overcloud_upgrade_run.sh.j2
index d17870dd..3e090776 100644
--- a/templates/overcloud_upgrade_run.sh.j2
+++ b/templates/overcloud_upgrade_run.sh.j2
@@ -93,9 +93,6 @@ openstack overcloud upgrade run \
         {% if tripleo_upgrade_debug|bool %}
         --debug \
         {% endif -%}
-        {% if overcloud_ssh_user -%}
-        --ssh-user {{ overcloud_ssh_user }} \
-        {% endif -%}
         --roles {{ item }} --playbook all 2>&1
 
 echo "[$(date)] Finished major upgrade for {{ item }} role"