From 00c80ef7d1f74f7878738a094782b10b8dae2c05 Mon Sep 17 00:00:00 2001
From: Sylvere Kanapa <sylvere.kanapa@univ-lyon1.fr>
Date: Wed, 26 Jun 2024 13:18:06 +0200
Subject: [PATCH] Add missing "cloud-init" as "cloud-init-datasource" don't
 have dependency on it.

Change-Id: I8f75fb1237183fbfbb790cd3089a2346a7e49277
---
 ansible/inventory/group_vars/all/overcloud-dib             | 3 ++-
 etc/kayobe/overcloud-dib.yml                               | 2 +-
 .../notes/fix-cloud-init-not-default-eb8ecbd00356467e.yaml | 7 +++++++
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/fix-cloud-init-not-default-eb8ecbd00356467e.yaml

diff --git a/ansible/inventory/group_vars/all/overcloud-dib b/ansible/inventory/group_vars/all/overcloud-dib
index e927d8cd..e6faefca 100644
--- a/ansible/inventory/group_vars/all/overcloud-dib
+++ b/ansible/inventory/group_vars/all/overcloud-dib
@@ -34,9 +34,10 @@ overcloud_dib_os_element: "{{ 'rocky-container' if os_distribution == 'rocky' el
 overcloud_dib_os_release: "{{ os_release }}"
 
 # List of default DIB elements. Default is ["{{ overcloud_dib_os_element }}",
-# "cloud-init-datasources", "enable-serial-console", "vm"].
+# "cloud-init", "cloud-init-datasources", "enable-serial-console", "vm"].
 overcloud_dib_elements_default:
   - "{{ overcloud_dib_os_element }}"
+  - "cloud-init"
   - "cloud-init-datasources"
   - "enable-serial-console"
   - "vm"
diff --git a/etc/kayobe/overcloud-dib.yml b/etc/kayobe/overcloud-dib.yml
index f5f93520..e3066fda 100644
--- a/etc/kayobe/overcloud-dib.yml
+++ b/etc/kayobe/overcloud-dib.yml
@@ -30,7 +30,7 @@
 #overcloud_dib_os_release:
 
 # List of default DIB elements. Default is ["{{ overcloud_dib_os_element }}",
-# "cloud-init-datasources", "enable-serial-console", "vm"].
+# "cloud-init", "cloud-init-datasources", "enable-serial-console", "vm"].
 #overcloud_dib_elements_default:
 
 # List of additional DIB elements. Default is none.
diff --git a/releasenotes/notes/fix-cloud-init-not-default-eb8ecbd00356467e.yaml b/releasenotes/notes/fix-cloud-init-not-default-eb8ecbd00356467e.yaml
new file mode 100644
index 00000000..b314f23c
--- /dev/null
+++ b/releasenotes/notes/fix-cloud-init-not-default-eb8ecbd00356467e.yaml
@@ -0,0 +1,7 @@
+fixes:
+  - |
+    Fixes an issue where networking failed to come up after kayobe
+    ``overcloud host provision`` as cloud-init wasn't installed. Add
+    ``cloud-init`` element to ``overcloud_dib_elements_default`` so it's no
+    longer missing.
+    Expected behavior was that ``cloud-init-datasource`` had it as dependency.
-- 
GitLab