sync with changes from master

elements/undercloud-install/post-install.d/90-restart-xinetd

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -eux
+
+# xinetd controls starting the tftpd daemon so pxelinux.0 can be downloaded.
+# This is not needed upstream b/c usually it starts on boot, but we aren't
+# booting an undercloud here, we're installing one.
+systemctl restart xinetd

elements/undercloud-install/pre-install.d/02-erase-networkmanager

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -eux
-
-yum -y erase NetworkManager

json-files/fedora-20-undercloud.json

@@ -18,7 +18,6 @@
       "boot-stack",
       "nova-baremetal",
       "os-collect-config",
-      "dhcp-all-interfaces",
       "neutron-dhcp-agent",
       "undercloud-stack-config",
       "selinux-permissive"
@@ -35,7 +34,8 @@
     ],
     "blacklist": [
       "15-fedora-remove-grub",
-      "51-ironicclient"
+      "51-ironicclient",
+      "05-fstab-rootfs-label"
     ]
   }
 ]