diff --git a/manifests/init.pp b/manifests/init.pp
index 06be18de1..056a1e5db 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -776,4 +776,14 @@ class nova(
   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 e2f35c036..a40c05238 100644
--- a/spec/classes/nova_init_spec.rb
+++ b/spec/classes/nova_init_spec.rb
@@ -61,6 +61,11 @@ describe 'nova' do
         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
@@ -162,6 +167,11 @@ describe 'nova' do
         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