From 3e649a74b9188b72bddaf0118c52c5faeaac32e5 Mon Sep 17 00:00:00 2001
From: Julia Kreger <juliaashleykreger@gmail.com>
Date: Mon, 3 Jul 2017 15:05:46 +0000
Subject: [PATCH] Follow-up for bugfix 1694645 patch

This change addresses review feedback from change
I55229f0ab37e657b7668dd4fe402fe6b5a6cda40 in the release
note, as well as the parameter text. Accordingly, the sample
configuration has been updated.

Change-Id: Ieea574f1bcc9b6c663aeb8d89475c1dd8cf6964d
---
 etc/ironic/ironic.conf.sample                      |  6 +++---
 ironic/conf/default.py                             |  2 +-
 .../notes/bug-1694645-57289200e35bd883.yaml        | 14 ++++++--------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample
index f2b689bb61..942ed77c86 100644
--- a/etc/ironic/ironic.conf.sample
+++ b/etc/ironic/ironic.conf.sample
@@ -315,9 +315,9 @@
 #grub_config_template = $pybasedir/common/grub_conf.template
 
 # Path to ldlinux.c32 file. This file is required for syslinux
-# 5.0 or later. If not specified, the file is searched in
-# general paths, "/usr/lib/syslinux/modules/bios/ldlinux.c32"
-# and "/usr/share/syslinux/ldlinux.c32". (string value)
+# 5.0 or later. If not specified, the file is looked for in
+# "/usr/lib/syslinux/modules/bios/ldlinux.c32" and
+# "/usr/share/syslinux/ldlinux.c32". (string value)
 #ldlinux_c32 = <None>
 
 # Run image downloads and raw format conversions in parallel.
diff --git a/ironic/conf/default.py b/ironic/conf/default.py
index 6e1012224a..626ad3a186 100644
--- a/ironic/conf/default.py
+++ b/ironic/conf/default.py
@@ -202,7 +202,7 @@ image_opts = [
     cfg.StrOpt('ldlinux_c32',
                help=_('Path to ldlinux.c32 file. This file is required for '
                       'syslinux 5.0 or later. If not specified, the file is '
-                      'searched in general paths, '
+                      'looked for in '
                       '"/usr/lib/syslinux/modules/bios/ldlinux.c32" and '
                       '"/usr/share/syslinux/ldlinux.c32".')),
 ]
diff --git a/releasenotes/notes/bug-1694645-57289200e35bd883.yaml b/releasenotes/notes/bug-1694645-57289200e35bd883.yaml
index 496e3a9c4b..a304d6a32c 100644
--- a/releasenotes/notes/bug-1694645-57289200e35bd883.yaml
+++ b/releasenotes/notes/bug-1694645-57289200e35bd883.yaml
@@ -1,14 +1,12 @@
 ---
 fixes:
   - |
-    Fix a bug that netboot is unavailable with virtual media boot in an
-    environment using syslinux 5.00 or later such as Ubuntu 16.04. This is
-    caused by a change in syslinux that ldlinux.c32 is required for creating
-    boot ISO. This file is searched in the following general paths:
+    Fixes a bug whereby netboot was unavailable with virtual media boot in an
+    environment using syslinux 5.00 or later, such as Ubuntu 16.04. This was
+    caused by a syslinux change; the ldlinux.c32 file is required for creating
+    a boot ISO. To address this, the new configuration option
+    ``[DEFAULT]/ldlinux_32`` can be set to the path of the ldlinux.c32 file.
+    If not specified, the default is to look for the file in the paths:
 
       * /usr/lib/syslinux/modules/bios/ldlinux.c32
       * /usr/share/syslinux/ldlinux.c32
-
-    This path can be set with the configuration parameter
-    ``[DEFAULT]/ldlinux_c32`` for another distribution or for a case where the
-    path is changed with future update.