From ce9d938cd695e737a2f676d29244978acbf72e38 Mon Sep 17 00:00:00 2001
From: Roman Safronov <rsafrono@redhat.com>
Date: Mon, 30 Aug 2021 23:45:30 +0300
Subject: [PATCH] Add --overcloud-ssh-username option to Tobiko InfraRed plugin

It adds the ability to specify custom tripleo.overcloud_ssh_username
option to tobiko.conf file.

This is needed for some downstream jobs that use a custom ssh user
rather than default one (heat-admin).

Change-Id: I42a8e2d294bbe21f127150d45670be0a540b9e2f
---
 infrared_plugin/plugin.spec               | 4 ++++
 roles/tobiko-configure/defaults/main.yaml | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/infrared_plugin/plugin.spec b/infrared_plugin/plugin.spec
index 8c8425e91..bafaf6485 100644
--- a/infrared_plugin/plugin.spec
+++ b/infrared_plugin/plugin.spec
@@ -129,6 +129,10 @@ subparsers:
             type: Value
             help: hostname or IP address to be used to connect to undercloud host
             ansible_variable: undercloud_ssh_hostname
+          overcloud-ssh-username:
+            type: Value
+            help: user name to be used to connect to TripleO Overcloud hosts
+            ansible_variable: overcloud_ssh_username
 
       - title: Run stage
         options:
diff --git a/roles/tobiko-configure/defaults/main.yaml b/roles/tobiko-configure/defaults/main.yaml
index f021d2ee5..9bb35c07d 100644
--- a/roles/tobiko-configure/defaults/main.yaml
+++ b/roles/tobiko-configure/defaults/main.yaml
@@ -12,6 +12,7 @@ test_default_conf:
 
   tripleo:
     undercloud_ssh_hostname: "{{ undercloud_ssh_hostname }}"
+    overcloud_ssh_username: "{{ overcloud_ssh_username }}"
 
 test_log_debug: false
 
@@ -22,5 +23,6 @@ test_runner_timeout: 14400.
 stackrc_file: '{{ ansible_user_dir }}/overcloudrc'
 
 undercloud_hostname: '{{ groups.get("undercloud", []) | first | default("undercloud-0") }}'
-
 undercloud_ssh_hostname: ''
+
+overcloud_ssh_username: ''