Merge "Fix PXE setup for fresh Ubuntu Xenial"

devstack/files/debs/ironic

@@ -1,4 +1,15 @@
 # apparmor is an undeclared dependency for docker on ubuntu: https://github.com/docker/docker/issues/9745
+# Starting with Debian Jessie (and thus in Ubuntu Xenial too),
+# pxelinux package provides the pxelinux.0 boot loader,
+# but such package is absent from Debian Wheezy / Ubuntu Trusty.
+# Also, in Debian Wheezy / Ubuntu Trusty 'syslinux' depends on syslinux-common,
+# but only recommends it in Jessie/Xenial.
+# Make sure syslinux-common is installed for those distros as it provides
+# *.c32 modules for syslinux
+# TODO remove distro pinning when Wheezy / Trusty are EOLed (May 2019)
+# or DevStack stops supporting those.
+# In the mean time, new Debian-based release codenames will have to be added
+# as distros can not be pinned with 'if-later-than' specified.
 apparmor
 docker.io
 ipmitool
@@ -9,6 +20,7 @@ libguestfs0
 libvirt-bin
 open-iscsi
 openssh-client
+pxelinux # dist:jessie,xenial
 python-libguestfs
 python-libvirt
 qemu
@@ -17,6 +29,7 @@ qemu-utils
 sgabios
 shellinabox
 syslinux
+syslinux-common # dist:jessie,xenial
 tftpd-hpa
 xinetd
 squashfs-tools

devstack/lib/ironic

@@ -551,7 +551,7 @@ function configure_ironic_dirs {
         sudo install -d -o $STACK_USER -g $LIBVIRT_GROUP $IRONIC_HTTP_DIR
     fi
 
-    if [ ! -f $IRONIC_PXE_BOOT_IMAGE ]; then
+    if [ ! -f "$IRONIC_PXE_BOOT_IMAGE" ]; then
         die $LINENO "PXE boot file $IRONIC_PXE_BOOT_IMAGE not found."
     fi