From c542b27bb981c00f20315953067d9971fb0d6597 Mon Sep 17 00:00:00 2001
From: Jakub Libosvar <libosvar@redhat.com>
Date: Fri, 19 Mar 2021 12:12:16 +0100
Subject: [PATCH] ovn-migration: UNDERCLOUD_NODE_USER variable

The undercloud node user is configurable in TripleO and isn't always set
to heat-admin. This patch introduces an environment variable for cases
where user is different.

Closes-bug: 1927213

Change-Id: If65925ded1b5df2bfdcfba50445ff7d821c725d8
Signed-off-by: Jakub Libosvar <libosvar@redhat.com>
(cherry picked from commit 7bb5fb2de1a2bd5afb2ddfa5291ffdeead28f6a8)
---
 doc/source/ovn/migration.rst                             | 3 +++
 tools/ovn_migration/tripleo_environment/ovn_migration.sh | 9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/doc/source/ovn/migration.rst b/doc/source/ovn/migration.rst
index dff37244e87..f51d4d53b6f 100644
--- a/doc/source/ovn/migration.rst
+++ b/doc/source/ovn/migration.rst
@@ -107,6 +107,9 @@ Perform the following steps in the undercloud
      step 1.
      Default: ~/overcloud-deploy-ovn.sh
 
+   * UNDERCLOUD_NODE_USER - user used on the undercloud nodes
+     Default: heat-admin
+
    * STACK_NAME - Name or ID of the heat stack
      Default: 'overcloud'
      If the stack that is migrated differs from the default, please set this
diff --git a/tools/ovn_migration/tripleo_environment/ovn_migration.sh b/tools/ovn_migration/tripleo_environment/ovn_migration.sh
index 20b25612a32..742c457d5ce 100644
--- a/tools/ovn_migration/tripleo_environment/ovn_migration.sh
+++ b/tools/ovn_migration/tripleo_environment/ovn_migration.sh
@@ -29,6 +29,9 @@ LANG=C
 # overcloud deploy script for OVN migration.
 : ${OVERCLOUD_OVN_DEPLOY_SCRIPT:=~/overcloud-deploy-ovn.sh}
 
+# user on the nodes in the undercloud
+: ${UNDERCLOUD_NODE_USER:=heat-admin}
+
 : ${OPT_WORKDIR:=$PWD}
 : ${STACK_NAME:=overcloud}
 : ${PUBLIC_NETWORK_NAME:=public}
@@ -138,7 +141,7 @@ generate_ansible_inventory_file() {
             ovn_central=False
             node="$node_name ansible_host=$node_ip ovn_central=true"
         fi
-        echo $node ansible_ssh_user=heat-admin ansible_become=true >> hosts_for_migration
+        echo $node ansible_ssh_user=$UNDERCLOUD_NODE_USER ansible_become=true >> hosts_for_migration
     done
 
     echo "" >> hosts_for_migration
@@ -148,7 +151,7 @@ generate_ansible_inventory_file() {
     OVN_CONTROLLERS=$(get_group_hosts "$inventory_file" neutron_ovs_agent)
     for node_name in $OVN_CONTROLLERS; do
         node_ip=$(get_host_ip "$inventory_file" $node_name)
-        echo $node_name ansible_host=$node_ip ansible_ssh_user=heat-admin ansible_become=true ovn_controller=true >> hosts_for_migration
+        echo $node_name ansible_host=$node_ip ansible_ssh_user=$UNDERCLOUD_NODE_USER ansible_become=true ovn_controller=true >> hosts_for_migration
     done
     rm -f "$inventory_file"
     echo "" >> hosts_for_migration
@@ -168,7 +171,7 @@ EOF
     cat >> hosts_for_migration << EOF
 
 [$1:vars]
-remote_user=heat-admin
+remote_user=$UNDERCLOUD_NODE_USER
 public_network_name=$PUBLIC_NETWORK_NAME
 image_name=$IMAGE_NAME
 working_dir=$OPT_WORKDIR