Make fix-hostname playbook more generic

Alex-Welsh · Alex-Welsh · commit 9913ab5ba7b6 · 2024-08-21T09:26:52.000+01:00
diff --git a/etc/kayobe/ansible/fix-hostname.yml b/etc/kayobe/ansible/fix-hostname.yml
@@ -1,6 +1,6 @@
 ---
-- name: Fix hostname on storage nodes for cephadm
-  hosts: storage
+- name: Fix hostname
+  hosts: reboot_hosts
   gather_facts: false
   vars:
     ansible_user: "{{ bootstrap_user }}"
diff --git a/etc/kayobe/environments/ci-aio/inventory/groups b/etc/kayobe/environments/ci-aio/inventory/groups
@@ -3,3 +3,6 @@
 [container-image-builders:children]
 # Build container images on the all-in-one controller.
 controllers
+
+[reboot_hosts:children]
+controllers
diff --git a/etc/kayobe/inventory/groups b/etc/kayobe/inventory/groups
@@ -132,6 +132,9 @@ rgws
 [cis-hardening:children]
 overcloud
 
+[reboot_hosts:children]
+storage
+
 ###############################################################################
 # Monitoring groups.
 
diff --git a/terraform/aio/vm.tf b/terraform/aio/vm.tf
@@ -89,7 +89,6 @@ resource "null_resource" "kayobe-aio" {
       # current images, /tmp is noexec, so the path must be changed
       script_path = "/home/${var.ssh_username}/start.sh"
     }
-
     inline = [
       "#!/bin/sh",
       "echo 'connected!'"

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@ resource "null_resource" "kayobe-aio" {`
`89`	`89`	`# current images, /tmp is noexec, so the path must be changed`
`90`	`90`	`script_path = "/home/${var.ssh_username}/start.sh"`
`91`	`91`	`}`
`92`		`-`
`93`	`92`	`inline = [`
`94`	`93`	`"#!/bin/sh",`
`95`	`94`	`"echo 'connected!'"`