diff --git a/manifests/init.pp b/manifests/init.pp
index 6ffa24c59..266638579 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -792,18 +792,4 @@ class nova(
     }
   }
 
-  # Deprecated in Juno, removed in Kilo
-  nova_config {
-    'DEFAULT/os_region_name':       ensure => absent;
-  }
-
-  # Deprecated in Juno, removed in Kilo
-  nova_config {
-    'DEFAULT/rabbit_userid':       ensure => absent;
-    'DEFAULT/rabbit_host':         ensure => absent;
-    'DEFAULT/rabbit_port':         ensure => absent;
-    'DEFAULT/rabbit_password':     ensure => absent;
-    'DEFAULT/rabbit_virtual_host': ensure => absent;
-  }
-
 }
diff --git a/spec/classes/nova_init_spec.rb b/spec/classes/nova_init_spec.rb
index 9314c12fc..64ea03310 100644
--- a/spec/classes/nova_init_spec.rb
+++ b/spec/classes/nova_init_spec.rb
@@ -59,12 +59,6 @@ describe 'nova' do
         is_expected.to contain_nova_config('DEFAULT/rootwrap_config').with_value('/etc/nova/rootwrap.conf')
         is_expected.to contain_nova_config('DEFAULT/report_interval').with_value('10')
         is_expected.to contain_nova_config('DEFAULT/use_ipv6').with_value('<SERVICE DEFAULT>')
-        is_expected.to contain_nova_config('DEFAULT/os_region_name').with_ensure('absent')
-        is_expected.to contain_nova_config('DEFAULT/rabbit_userid').with_ensure('absent')
-        is_expected.to contain_nova_config('DEFAULT/rabbit_host').with_ensure('absent')
-        is_expected.to contain_nova_config('DEFAULT/rabbit_port').with_ensure('absent')
-        is_expected.to contain_nova_config('DEFAULT/rabbit_password').with_ensure('absent')
-        is_expected.to contain_nova_config('DEFAULT/rabbit_virtual_host').with_ensure('absent')
         is_expected.to contain_nova_config('cinder/os_region_name').with_ensure('absent')
         is_expected.to contain_nova_config('cinder/catalog_info').with('value' => 'volumev2:cinderv2:publicURL')
       end
@@ -166,12 +160,6 @@ describe 'nova' do
         is_expected.to contain_nova_config('DEFAULT/report_interval').with_value('60')
         is_expected.to contain_nova_config('DEFAULT/use_ipv6').with_value('true')
         is_expected.to contain_nova_config('cinder/os_region_name').with_value('MyRegion')
-        is_expected.to contain_nova_config('DEFAULT/os_region_name').with_ensure('absent')
-        is_expected.to contain_nova_config('DEFAULT/rabbit_userid').with_ensure('absent')
-        is_expected.to contain_nova_config('DEFAULT/rabbit_host').with_ensure('absent')
-        is_expected.to contain_nova_config('DEFAULT/rabbit_port').with_ensure('absent')
-        is_expected.to contain_nova_config('DEFAULT/rabbit_password').with_ensure('absent')
-        is_expected.to contain_nova_config('DEFAULT/rabbit_virtual_host').with_ensure('absent')
       end
 
       context 'with multiple notification_driver' do