diff --git a/manifests/scheduler/filter.pp b/manifests/scheduler/filter.pp
index ecb6e7d22..1c3b780c0 100644
--- a/manifests/scheduler/filter.pp
+++ b/manifests/scheduler/filter.pp
@@ -4,11 +4,6 @@
 #
 # === Parameters:
 #
-# [*scheduler_host_manager*]
-#   (optional) The scheduler host manager class to use. Should be either
-#   'host_manager' or 'ironic_host_manager'
-#   Defaults to 'host_manager'
-#
 # [*scheduler_max_attempts*]
 #   (optional) Maximum number of attempts to schedule an instance
 #   Defaults to '3'
@@ -101,8 +96,12 @@
 #   Use baremetal_scheduler_default_filters or not.
 #   No longer used. Defaults to undef
 #
+# [*scheduler_host_manager*]
+#   The scheduler host manager class to use.
+#   No longer used. Defaults to undef
+#
+
 class nova::scheduler::filter (
-  $scheduler_host_manager                         = 'host_manager',
   $scheduler_max_attempts                         = '3',
   $scheduler_host_subset_size                     = '1',
   $max_io_ops_per_host                            = '8',
@@ -125,6 +124,7 @@ class nova::scheduler::filter (
   # DEPRECATED
   $baremetal_scheduler_default_filters            = undef,
   $scheduler_use_baremetal_filters                = undef,
+  $scheduler_host_manager                         = undef,
 ) {
 
   include ::nova::deps
@@ -151,8 +151,8 @@ class nova::scheduler::filter (
     $scheduler_available_filters_real = any2array($scheduler_available_filters)
   }
 
-  if $baremetal_scheduler_default_filters or $scheduler_use_baremetal_filters {
-    warning('The baremetal_scheduler_default_filters and \
+  if $baremetal_scheduler_default_filters or $scheduler_use_baremetal_filters or $scheduler_host_manager {
+    warning('The scheduler_host_manager, baremetal_scheduler_default_filters and \
 scheduler_use_baremetal_filters parameters are deprecated and will have \
 no effect. Baremetal scheduling now uses custom resource classes.')
   }
@@ -172,7 +172,6 @@ no effect. Baremetal scheduling now uses custom resource classes.')
 
   # TODO(aschultz): these should probably be in nova::scheduler ...
   nova_config {
-    'scheduler/host_manager':           value => $scheduler_host_manager;
     'scheduler/max_attempts':           value => $scheduler_max_attempts;
     'scheduler/periodic_task_interval': value => $periodic_task_interval;
   }
diff --git a/releasenotes/notes/remove_baremetal_filters-1205c7259536c7bc.yaml b/releasenotes/notes/remove_baremetal_filters-1205c7259536c7bc.yaml
index c4779977b..ecff926c2 100644
--- a/releasenotes/notes/remove_baremetal_filters-1205c7259536c7bc.yaml
+++ b/releasenotes/notes/remove_baremetal_filters-1205c7259536c7bc.yaml
@@ -1,12 +1,14 @@
 ---
 deprecations:
   - |
-    The nova scheduler baremetal Exact* filters have now been removed.
+    The nova scheduler baremetal Exact* filters and ironic host_manager
+    have now been removed.
     As a result the following parameters are now deprecated and have
     no effect:
 
     ``nova::scheduler::filter::baremetal_scheduler_default_filter``
     ``nova::scheduler::filter::scheduler_use_baremetal_filters``
+    ``nova::scheduler::filter::scheduler_host_manager``
 
     Baremetal scheduling will use the custom resource class defined for
     each baremetal node to make its selection. Refer to the ironic
diff --git a/spec/classes/nova_scheduler_filter_spec.rb b/spec/classes/nova_scheduler_filter_spec.rb
index 78ba94c2d..5b6b13afc 100644
--- a/spec/classes/nova_scheduler_filter_spec.rb
+++ b/spec/classes/nova_scheduler_filter_spec.rb
@@ -9,7 +9,6 @@ describe 'nova::scheduler::filter' do
   shared_examples 'nova::scheduler::filter' do
 
     context 'with default parameters' do
-      it { is_expected.to contain_nova_config('scheduler/host_manager').with_value('host_manager') }
       it { is_expected.to contain_nova_config('scheduler/max_attempts').with_value('3') }
       it { is_expected.to contain_nova_config('scheduler/periodic_task_interval').with_value('<SERVICE DEFAULT>') }
       it { is_expected.to contain_nova_config('filter_scheduler/host_subset_size').with_value('1') }
@@ -32,6 +31,7 @@ describe 'nova::scheduler::filter' do
 
       it { is_expected.to_not contain_nova_config('filter_scheduler/use_baremetal_filters') }
       it { is_expected.to_not contain_nova_config('filter_scheduler/baremetal_enabled_filters') }
+      it { is_expected.to_not contain_nova_config('scheduler/host_manager') }
     end
 
     context 'when overriding params with non-empty arrays' do