diff --git a/README.rst b/README.rst
index dd23ebf..56ecdb1 100644
--- a/README.rst
+++ b/README.rst
@@ -529,6 +529,12 @@
   glance image-update --property hw_scsi_model=virtio-scsi <image>
   glance image-update --property hw_disk_bus=scsi <image>
 
+
+Scheduler Host Manager
+----------------------
+
+Specify a custom host manager.
+
 libvirt CPU mode
 ----------------
 
@@ -536,9 +542,13 @@
 support live migration between hypervisors with different hardware, among other
 things. Defaults to host-passthrough.
 
+
 .. code-block:: yaml
 
   nova:
+    controller:
+      scheduler_host_manager: ironic_host_manager
+
     compute:
       cpu_mode: host-model
 
diff --git a/nova/files/newton/nova-controller.conf.Debian b/nova/files/newton/nova-controller.conf.Debian
index daa8334..c8e0bee 100644
--- a/nova/files/newton/nova-controller.conf.Debian
+++ b/nova/files/newton/nova-controller.conf.Debian
@@ -21,7 +21,6 @@
 disk_allocation_ratio = {{ controller.disk_allocation_ratio }}
 scheduler_default_filters = {{ controller.scheduler_default_filters }}
 scheduler_available_filters = nova.scheduler.filters.all_filters
-scheduler_available_filters = nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter
 {% for filter in controller.get('scheduler_custom_filters', []) %}
 scheduler_available_filters = {{ filter }}
 {% endfor %}
@@ -38,7 +37,7 @@
 scheduler_max_attempts=3
 max_io_ops_per_host=8
 max_instances_per_host=50
-scheduler_host_manager=host_manager
+scheduler_host_manager={{ controller.get('scheduler_host_manager', 'host_manager') }}
 use_forwarded_for=False
 reservation_expire=86400
 compute_driver = libvirt.LibvirtDriver