From 0477e45cd9df39e5f9efcdfe9a24e3c21620b7f3 Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@protonmail.com>
Date: Fri, 5 Jun 2020 16:40:12 +0200
Subject: [PATCH] Set default deploy/rescue kernel/ramdisk in ironic.conf

Most likely people will use the kernel/ramdisk we provide, let's set
the defaults.

Change-Id: Ia7a2698344f8f1a14356dbfe9cd68ce667019606
---
 .../roles/bifrost-ironic-install/templates/ironic.conf.j2    | 4 ++++
 playbooks/roles/ironic-enroll-dynamic/tasks/main.yml         | 3 ---
 releasenotes/notes/default-ipa-fe012dfdba580bf4.yaml         | 5 +++++
 3 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/default-ipa-fe012dfdba580bf4.yaml

diff --git a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
index 2eff11b7a..778d1b773 100644
--- a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
+++ b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
@@ -67,6 +67,10 @@ fast_track = {{ fast_track }}
 [conductor]
 clean_nodes = {{ cleaning | lower }}
 automated_clean = {{ cleaning | lower }}
+deploy_kernel = {{ ipa_kernel_url }}
+deploy_ramdisk = {{ ipa_ramdisk_url }}
+rescue_kernel = {{ ipa_kernel_url }}
+rescue_ramdisk = {{ ipa_ramdisk_url }}
 
 [database]
 connection = mysql+pymysql://{{ ironic.database.username }}:{{ ironic.database.password }}@{{ ironic.database.host }}/{{ ironic.database.name }}?charset=utf8
diff --git a/playbooks/roles/ironic-enroll-dynamic/tasks/main.yml b/playbooks/roles/ironic-enroll-dynamic/tasks/main.yml
index 5cfe34218..ab8f2b955 100644
--- a/playbooks/roles/ironic-enroll-dynamic/tasks/main.yml
+++ b/playbooks/roles/ironic-enroll-dynamic/tasks/main.yml
@@ -51,6 +51,3 @@
     properties: "{{ properties | default({}) }}"
     driver_info:
       power: "{{ driver_info.power }}"
-      deploy:
-        deploy_kernel: "{{ ipa_kernel_url }}"
-        deploy_ramdisk: "{{ ipa_ramdisk_url }}"
diff --git a/releasenotes/notes/default-ipa-fe012dfdba580bf4.yaml b/releasenotes/notes/default-ipa-fe012dfdba580bf4.yaml
new file mode 100644
index 000000000..058ca2a11
--- /dev/null
+++ b/releasenotes/notes/default-ipa-fe012dfdba580bf4.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Configures the default deploy and rescue kernel/ramdisk, setting them
+    in ``driver_info`` is now optional.