From a12c76d56d7df1e671978ab93a93d72f01d00760 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 15 Nov 2022 10:08:59 +0000
Subject: [PATCH] CI: use cloud-user as bootstrap user on CentOS

cloud-init was changed to make CentOS more similar to RHEL, using a
cloud-user account rather than centos.

https://github.com/canonical/cloud-init/pull/1639
---
 etc/kayobe/environments/ci-aio/controllers.yml | 7 +++++++
 etc/kayobe/environments/ci-builder/seed.yml    | 7 +++++++
 terraform/aio/vm.tf                            | 8 ++++----
 3 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 etc/kayobe/environments/ci-aio/controllers.yml
 create mode 100644 etc/kayobe/environments/ci-builder/seed.yml

diff --git a/etc/kayobe/environments/ci-aio/controllers.yml b/etc/kayobe/environments/ci-aio/controllers.yml
new file mode 100644
index 000000000..86ef1fad5
--- /dev/null
+++ b/etc/kayobe/environments/ci-aio/controllers.yml
@@ -0,0 +1,7 @@
+---
+###############################################################################
+# Controller node configuration.
+
+# User with which to access the controllers via SSH during bootstrap, in order
+# to setup the Kayobe user account. Default is {{ os_distribution }}.
+controller_bootstrap_user: "{{ os_distribution if os_distribution == 'ubuntu' else 'cloud-user' }}"
diff --git a/etc/kayobe/environments/ci-builder/seed.yml b/etc/kayobe/environments/ci-builder/seed.yml
new file mode 100644
index 000000000..38f28ba88
--- /dev/null
+++ b/etc/kayobe/environments/ci-builder/seed.yml
@@ -0,0 +1,7 @@
+---
+###############################################################################
+# Seed node configuration.
+
+# User with which to access the seed via SSH during bootstrap, in order
+# to setup the Kayobe user account. Default is {{ os_distribution }}.
+seed_bootstrap_user: "{{ os_distribution if os_distribution == 'ubuntu' else 'cloud-user' }}"
diff --git a/terraform/aio/vm.tf b/terraform/aio/vm.tf
index 9b9ccf631..dc39b088f 100644
--- a/terraform/aio/vm.tf
+++ b/terraform/aio/vm.tf
@@ -67,25 +67,25 @@ resource "openstack_compute_instance_v2" "kayobe-aio" {
 
   provisioner "file" {
     source      = "scripts/configure-local-networking.sh"
-    destination = "/home/centos/configure-local-networking.sh"
+    destination = "/home/cloud-user/configure-local-networking.sh"
 
     connection {
       type        = "ssh"
       host        = self.access_ip_v4
-      user        = "centos"
+      user        = "cloud-user"
       private_key = file(var.ssh_private_key)
     }
   }
 
   provisioner "remote-exec" {
     inline = [
-      "sudo bash /home/centos/configure-local-networking.sh"
+      "sudo bash /home/cloud-user/configure-local-networking.sh"
     ]
 
     connection {
       type        = "ssh"
       host        = self.access_ip_v4
-      user        = "centos"
+      user        = "cloud-user"
       private_key = file(var.ssh_private_key)
     }