From 3b960e5bdd78b68c132106187aa7f7d14548cb2f Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 27 Apr 2021 10:41:35 +0100
Subject: [PATCH] Use $USER as bootstrap users

This reverts to the default value of 'controller_bootstrap_user',
'seed_bootstrap_user' and 'seed_hypervisor_bootstrap_user' prior to the
addition of the os_distribution variable in Kayobe
(https://review.opendev.org/c/openstack/kayobe/+/787352). In an
all-in-one environment, using the current user as the bootstrap user
makes sense.

Story: 2004960
Task: 42386

Change-Id: I814cd3d97e850a9b0062f92ec5622a756bed0347
---
 etc/kayobe/controllers.yml     | 2 +-
 etc/kayobe/seed-hypervisor.yml | 2 +-
 etc/kayobe/seed.yml            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/etc/kayobe/controllers.yml b/etc/kayobe/controllers.yml
index 2fbe85b..f7dcef5 100644
--- a/etc/kayobe/controllers.yml
+++ b/etc/kayobe/controllers.yml
@@ -4,7 +4,7 @@
 
 # User with which to access the controllers via SSH during bootstrap, in order
 # to setup the Kayobe user account.
-#controller_bootstrap_user:
+controller_bootstrap_user: "{{ lookup('env', 'USER') }}"
 
 ###############################################################################
 # Controller network interface configuration.
diff --git a/etc/kayobe/seed-hypervisor.yml b/etc/kayobe/seed-hypervisor.yml
index 1ef8988..054c44c 100644
--- a/etc/kayobe/seed-hypervisor.yml
+++ b/etc/kayobe/seed-hypervisor.yml
@@ -4,7 +4,7 @@
 
 # User with which to access the seed hypervisor via SSH during bootstrap, in
 # order to setup the Kayobe user account.
-#seed_hypervisor_bootstrap_user:
+seed_hypervisor_bootstrap_user: "{{ lookup('env', 'USER') }}"
 
 ###############################################################################
 # Seed hypervisor network interface configuration.
diff --git a/etc/kayobe/seed.yml b/etc/kayobe/seed.yml
index e0b5e0d..fc25963 100644
--- a/etc/kayobe/seed.yml
+++ b/etc/kayobe/seed.yml
@@ -4,7 +4,7 @@
 
 # User with which to access the seed via SSH during bootstrap, in order to
 # setup the Kayobe user account.
-#seed_bootstrap_user:
+seed_bootstrap_user: "{{ lookup('env', 'USER') }}"
 
 ###############################################################################
 # Seed network interface configuration.