From ca921839b2ae15407441edbafe27c1896695b14a Mon Sep 17 00:00:00 2001
From: Hironori Shiina <shiina.hironori@jp.fujitsu.com>
Date: Thu, 24 May 2018 20:23:35 +0900
Subject: [PATCH] Stop passing IP address to IPA by PXE

CoreOS version for Ironic Python Agent was upgraded in the Rocky. An
IPA built on CoreOS doesn't boot from PXE. A new validation added to
CoreOS doesn't allow 'ip' parameter passed by PXE when DHCP is used.
This patch changes 'ipappend' parameter in PXE configuration not to
pass 'ip' parameter.

Change-Id: I6d5ca3a51fcbe95bd9e541a6f5ad2f7352c86a6e
Story: 2002093
Task: 19771
---
 ironic/drivers/modules/pxe_config.template           | 2 +-
 ironic/tests/unit/drivers/pxe_config.template        | 2 +-
 releasenotes/notes/bug-2002093-9fcb3613d2daeced.yaml | 9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/bug-2002093-9fcb3613d2daeced.yaml

diff --git a/ironic/drivers/modules/pxe_config.template b/ironic/drivers/modules/pxe_config.template
index 06dfd07258..bdffdd7ab3 100644
--- a/ironic/drivers/modules/pxe_config.template
+++ b/ironic/drivers/modules/pxe_config.template
@@ -3,7 +3,7 @@ default deploy
 label deploy
 kernel {{ pxe_options.deployment_aki_path }}
 append initrd={{ pxe_options.deployment_ari_path }} selinux=0 troubleshoot=0 text {{ pxe_options.pxe_append_params|default("", true) }} ipa-api-url={{ pxe_options['ipa-api-url'] }} coreos.configdrive=0
-ipappend 3
+ipappend 2
 
 
 label boot_partition
diff --git a/ironic/tests/unit/drivers/pxe_config.template b/ironic/tests/unit/drivers/pxe_config.template
index 687460e4f2..cd571485a7 100644
--- a/ironic/tests/unit/drivers/pxe_config.template
+++ b/ironic/tests/unit/drivers/pxe_config.template
@@ -3,7 +3,7 @@ default deploy
 label deploy
 kernel /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/deploy_kernel
 append initrd=/tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/deploy_ramdisk selinux=0 troubleshoot=0 text test_param ipa-api-url=http://192.168.122.184:6385 coreos.configdrive=0
-ipappend 3
+ipappend 2
 
 
 label boot_partition
diff --git a/releasenotes/notes/bug-2002093-9fcb3613d2daeced.yaml b/releasenotes/notes/bug-2002093-9fcb3613d2daeced.yaml
new file mode 100644
index 0000000000..c0fd627d16
--- /dev/null
+++ b/releasenotes/notes/bug-2002093-9fcb3613d2daeced.yaml
@@ -0,0 +1,9 @@
+---
+upgrade:
+  - |
+    To use CoreOS based deploy/cleaning ramdisk built using Ironic Python Agent
+    from the Rocky release, Ironic should be upgraded to the Rocky release if
+    PXE is used. Otherwise, a node cannot be deployed or cleaned because the
+    IPA fails to boot due to an unsupported parameter passed via PXE. See
+    `bug 2002093 <https://storyboard.openstack.org/#!/story/2002093>`_ for
+    details.