Merge pull request #1257 from stackhpc/hook-hostname-fix

markgoddard · web-flow · commit b5bdd8a750a5 · 2024-09-11T09:36:57.000+01:00
Add hooks for fixing hostname bug in Multinode for Caracal upgrade job
diff --git a/etc/kayobe/ansible/fix-hostname.yml b/etc/kayobe/ansible/fix-hostname.yml
@@ -21,3 +21,9 @@
         cmd: hostnamectl set-hostname "{{ inventory_hostname }}"
       when: current_hostname.stdout != inventory_hostname
       become: true
+
+- name: Reboot hosts
+  import_playbook: "{{ playbook_dir | realpath }}/reboot.yml"
+  vars:
+    reboot_hosts: fix-hostname
+  when: current_hostname.stdout != inventory_hostname
diff --git a/etc/kayobe/ansible/reboot.yml b/etc/kayobe/ansible/reboot.yml
@@ -1,6 +1,6 @@
 ---
 - name: Reboot the host
-  hosts: seed-hypervisor:seed:overcloud:infra-vms
+  hosts: "{{ reboot_hosts | default('seed-hypervisor:seed:overcloud:infra-vms') }}"
   serial: "{{ lookup('env', 'ANSIBLE_SERIAL') | default(1, true) }}"
   gather_facts: false
   vars:
diff --git a/etc/kayobe/environments/ci-multinode/hooks/overcloud-host-configure/pre.d/10-fix-hostname.yml b/etc/kayobe/environments/ci-multinode/hooks/overcloud-host-configure/pre.d/10-fix-hostname.yml
@@ -0,0 +1 @@
+../../../../../ansible/fix-hostname.yml
diff --git a/etc/kayobe/environments/ci-multinode/inventory/groups b/etc/kayobe/environments/ci-multinode/inventory/groups
@@ -5,4 +5,4 @@
 controllers
 
 [fix-hostname:children]
-storage
+overcloud
diff --git a/etc/kayobe/environments/ci-multinode/reboot.yml b/etc/kayobe/environments/ci-multinode/reboot.yml
@@ -0,0 +1,3 @@
+---
+# Ensure that the reboot playbook is always executed using the boostrap user
+reboot_with_bootstrap_user: true

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../../../ansible/fix-hostname.yml`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+---`
	`2`	`+# Ensure that the reboot playbook is always executed using the boostrap user`
	`3`	`+reboot_with_bootstrap_user: true`