diff --git a/defaults/main.yml b/defaults/main.yml
index 5a7fdf0d..3b8bcbb6 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -138,38 +138,28 @@ nova_virt_types:
     nova_compute_driver: ironic.IronicDriver
     nova_scheduler_host_manager: ironic_host_manager
     nova_reserved_host_memory_mb: 0
-    nova_firewall_driver: nova.virt.firewall.NoopFirewallDriver
-    nova_scheduler_use_baremetal_filters: True
     nova_scheduler_tracks_instance_changes: False
   kvm:
     nova_compute_driver: libvirt.LibvirtDriver
     nova_scheduler_host_manager: host_manager
     nova_reserved_host_memory_mb: 2048
-    nova_firewall_driver: nova.virt.firewall.NoopFirewallDriver
-    nova_scheduler_use_baremetal_filters: False
     nova_scheduler_tracks_instance_changes: True
   lxd:
     nova_compute_driver: lxd.LXDDriver
     nova_scheduler_host_manager: host_manager
     nova_reserved_host_memory_mb: 2048
     nova_compute_manager: nova.compute.manager.ComputeManager
-    nova_firewall_driver: nova.virt.firewall.NoopFirewallDriver
-    nova_scheduler_use_baremetal_filters: False
     nova_scheduler_tracks_instance_changes: True
   qemu:
     nova_compute_driver: libvirt.LibvirtDriver
     nova_scheduler_host_manager: host_manager
     nova_reserved_host_memory_mb: 2048
-    nova_firewall_driver: nova.virt.firewall.NoopFirewallDriver
-    nova_scheduler_use_baremetal_filters: False
     nova_scheduler_tracks_instance_changes: True
     nova_cpu_mode: "none"
   powervm:
     nova_compute_driver: powervm.driver.PowerVMDriver
     nova_scheduler_host_manager: host_manager
     nova_reserved_host_memory_mb: 8192
-    nova_firewall_driver: nova.virt.firewall.NoopFirewallDriver
-    nova_scheduler_use_baremetal_filters: False
     nova_scheduler_tracks_instance_changes: True
 
 
@@ -251,7 +241,6 @@ nova_serialconsoleproxy_enabled: True
 
 ## Nova metadata
 nova_metadata_proxy_enabled: "{{ nova_network_services[nova_network_type]['metadata_proxy_enabled'] | bool }}"
-nova_metadata_host: "{{ internal_lb_vip_address }}"
 nova_metadata_port: 8775
 
 ## Nova compute
diff --git a/releasenotes/notes/pike_deprecations-39034d48825e8966.yaml b/releasenotes/notes/pike_deprecations-39034d48825e8966.yaml
new file mode 100644
index 00000000..e0247a8c
--- /dev/null
+++ b/releasenotes/notes/pike_deprecations-39034d48825e8966.yaml
@@ -0,0 +1,8 @@
+---
+other:
+  - |
+    The variables ``nova_scheduler_use_baremetal_filters`` and
+    ``nova_metadata_host`` have been removed, matching upstream nova changes.
+    The ``nova_virt_types`` dict no longer needs the
+    ``nova_scheduler_use_baremetal_filters`` and ``nova_firewall_driver``
+    keys as well.
diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2
index e9c28711..1a318b91 100644
--- a/templates/nova.conf.j2
+++ b/templates/nova.conf.j2
@@ -47,13 +47,9 @@ executor_thread_pool_size = {{ nova_rpc_thread_pool_size }}
 rpc_response_timeout = {{ nova_rpc_response_timeout }}
 
 # Metadata
-metadata_host = {{ nova_metadata_host }}
-metadata_port = {{ nova_metadata_port }}
 metadata_workers = {{ nova_metadata_workers | default(nova_api_threads) }}
 
 # Network
-dhcpbridge_flagfile = /etc/nova/nova.conf
-firewall_driver = {{ nova_firewall_driver }}
 my_ip = {% if nova_management_address == 'localhost' %}127.0.0.1{% else %}{{ nova_management_address }}{% endif %}
 
 ## Vif
@@ -326,7 +322,6 @@ available_filters = {{ nova_scheduler_available_filters }}
 enabled_filters = {{ nova_scheduler_default_filters }}
 host_subset_size = {{ nova_scheduler_host_subset_size }}
 weight_classes = {{ nova_scheduler_weight_classes }}
-use_baremetal_filters = {{ nova_scheduler_use_baremetal_filters }}
 tracks_instance_changes = {{ nova_scheduler_tracks_instance_changes }}
 
 [quota]