diff --git a/manifests/init.pp b/manifests/init.pp
index 7a58f3271..3db024682 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -403,55 +403,55 @@ class neutron (
       fail('When rpc_backend is rabbitmq, you must set rabbit password')
     }
     if $rabbit_hosts {
-      neutron_config { 'DEFAULT/rabbit_hosts':     value  => join($rabbit_hosts, ',') }
-      neutron_config { 'DEFAULT/rabbit_ha_queues': value  => true }
+      neutron_config { 'oslo_messaging_rabbit/rabbit_hosts':     value  => join($rabbit_hosts, ',') }
+      neutron_config { 'oslo_messaging_rabbit/rabbit_ha_queues': value  => true }
     } else  {
-      neutron_config { 'DEFAULT/rabbit_host':      value => $rabbit_host }
-      neutron_config { 'DEFAULT/rabbit_port':      value => $rabbit_port }
-      neutron_config { 'DEFAULT/rabbit_hosts':     value => "${rabbit_host}:${rabbit_port}" }
-      neutron_config { 'DEFAULT/rabbit_ha_queues': value => false }
+      neutron_config { 'oslo_messaging_rabbit/rabbit_host':      value => $rabbit_host }
+      neutron_config { 'oslo_messaging_rabbit/rabbit_port':      value => $rabbit_port }
+      neutron_config { 'oslo_messaging_rabbit/rabbit_hosts':     value => "${rabbit_host}:${rabbit_port}" }
+      neutron_config { 'oslo_messaging_rabbit/rabbit_ha_queues': value => false }
     }
 
     neutron_config {
-      'DEFAULT/rabbit_userid':         value => $rabbit_user;
-      'DEFAULT/rabbit_password':       value => $rabbit_password, secret => true;
-      'DEFAULT/rabbit_virtual_host':   value => $rabbit_virtual_host;
-      'DEFAULT/rabbit_use_ssl':        value => $rabbit_use_ssl;
-      'DEFAULT/kombu_reconnect_delay': value => $kombu_reconnect_delay;
+      'oslo_messaging_rabbit/rabbit_userid':         value => $rabbit_user;
+      'oslo_messaging_rabbit/rabbit_password':       value => $rabbit_password, secret => true;
+      'oslo_messaging_rabbit/rabbit_virtual_host':   value => $rabbit_virtual_host;
+      'oslo_messaging_rabbit/rabbit_use_ssl':        value => $rabbit_use_ssl;
+      'oslo_messaging_rabbit/kombu_reconnect_delay': value => $kombu_reconnect_delay;
     }
 
     if $rabbit_use_ssl {
 
       if $kombu_ssl_ca_certs {
-        neutron_config { 'DEFAULT/kombu_ssl_ca_certs': value => $kombu_ssl_ca_certs; }
+        neutron_config { 'oslo_messaging_rabbit/kombu_ssl_ca_certs': value => $kombu_ssl_ca_certs; }
       } else {
-        neutron_config { 'DEFAULT/kombu_ssl_ca_certs': ensure => absent; }
+        neutron_config { 'oslo_messaging_rabbit/kombu_ssl_ca_certs': ensure => absent; }
       }
 
       if $kombu_ssl_certfile or $kombu_ssl_keyfile {
         neutron_config {
-          'DEFAULT/kombu_ssl_certfile': value => $kombu_ssl_certfile;
-          'DEFAULT/kombu_ssl_keyfile':  value => $kombu_ssl_keyfile;
+          'oslo_messaging_rabbit/kombu_ssl_certfile': value => $kombu_ssl_certfile;
+          'oslo_messaging_rabbit/kombu_ssl_keyfile':  value => $kombu_ssl_keyfile;
         }
       } else {
         neutron_config {
-          'DEFAULT/kombu_ssl_certfile': ensure => absent;
-          'DEFAULT/kombu_ssl_keyfile':  ensure => absent;
+          'oslo_messaging_rabbit/kombu_ssl_certfile': ensure => absent;
+          'oslo_messaging_rabbit/kombu_ssl_keyfile':  ensure => absent;
         }
       }
 
       if $kombu_ssl_version {
-        neutron_config { 'DEFAULT/kombu_ssl_version':  value => $kombu_ssl_version; }
+        neutron_config { 'oslo_messaging_rabbit/kombu_ssl_version':  value => $kombu_ssl_version; }
       } else {
-        neutron_config { 'DEFAULT/kombu_ssl_version':  ensure => absent; }
+        neutron_config { 'oslo_messaging_rabbit/kombu_ssl_version':  ensure => absent; }
       }
 
     } else {
       neutron_config {
-        'DEFAULT/kombu_ssl_ca_certs': ensure => absent;
-        'DEFAULT/kombu_ssl_certfile': ensure => absent;
-        'DEFAULT/kombu_ssl_keyfile':  ensure => absent;
-        'DEFAULT/kombu_ssl_version':  ensure => absent;
+        'oslo_messaging_rabbit/kombu_ssl_ca_certs': ensure => absent;
+        'oslo_messaging_rabbit/kombu_ssl_certfile': ensure => absent;
+        'oslo_messaging_rabbit/kombu_ssl_keyfile':  ensure => absent;
+        'oslo_messaging_rabbit/kombu_ssl_version':  ensure => absent;
       }
     }
 
diff --git a/spec/classes/neutron_init_spec.rb b/spec/classes/neutron_init_spec.rb
index 575625101..0c150c38e 100644
--- a/spec/classes/neutron_init_spec.rb
+++ b/spec/classes/neutron_init_spec.rb
@@ -99,11 +99,11 @@ describe 'neutron' do
     end
 
     it 'configures credentials for rabbit' do
-      is_expected.to contain_neutron_config('DEFAULT/rabbit_userid').with_value( params[:rabbit_user] )
-      is_expected.to contain_neutron_config('DEFAULT/rabbit_password').with_value( params[:rabbit_password] )
-      is_expected.to contain_neutron_config('DEFAULT/rabbit_password').with_secret( true )
-      is_expected.to contain_neutron_config('DEFAULT/rabbit_virtual_host').with_value( params[:rabbit_virtual_host] )
-      is_expected.to contain_neutron_config('DEFAULT/kombu_reconnect_delay').with_value( params[:kombu_reconnect_delay] )
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_userid').with_value( params[:rabbit_user] )
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_password').with_value( params[:rabbit_password] )
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_password').with_secret( true )
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_virtual_host').with_value( params[:rabbit_virtual_host] )
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value( params[:kombu_reconnect_delay] )
     end
 
     it 'configures neutron.conf' do
@@ -133,19 +133,19 @@ describe 'neutron' do
 
   shared_examples_for 'rabbit HA with a single virtual host' do
     it 'in neutron.conf' do
-      is_expected.not_to contain_neutron_config('DEFAULT/rabbit_host')
-      is_expected.not_to contain_neutron_config('DEFAULT/rabbit_port')
-      is_expected.to contain_neutron_config('DEFAULT/rabbit_hosts').with_value( params[:rabbit_hosts] )
-      is_expected.to contain_neutron_config('DEFAULT/rabbit_ha_queues').with_value(true)
+      is_expected.not_to contain_neutron_config('oslo_messaging_rabbit/rabbit_host')
+      is_expected.not_to contain_neutron_config('oslo_messaging_rabbit/rabbit_port')
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_hosts').with_value( params[:rabbit_hosts] )
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value(true)
     end
   end
 
   shared_examples_for 'rabbit HA with multiple hosts' do
     it 'in neutron.conf' do
-      is_expected.not_to contain_neutron_config('DEFAULT/rabbit_host')
-      is_expected.not_to contain_neutron_config('DEFAULT/rabbit_port')
-      is_expected.to contain_neutron_config('DEFAULT/rabbit_hosts').with_value( params[:rabbit_hosts].join(',') )
-      is_expected.to contain_neutron_config('DEFAULT/rabbit_ha_queues').with_value(true)
+      is_expected.not_to contain_neutron_config('oslo_messaging_rabbit/rabbit_host')
+      is_expected.not_to contain_neutron_config('oslo_messaging_rabbit/rabbit_port')
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_hosts').with_value( params[:rabbit_hosts].join(',') )
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value(true)
     end
   end
 
@@ -235,11 +235,11 @@ describe 'neutron' do
     end
 
     it do
-      is_expected.to contain_neutron_config('DEFAULT/rabbit_use_ssl').with_value('true')
-      is_expected.to contain_neutron_config('DEFAULT/kombu_ssl_ca_certs').with_value('/path/to/ssl/ca/certs')
-      is_expected.to contain_neutron_config('DEFAULT/kombu_ssl_certfile').with_value('/path/to/ssl/cert/file')
-      is_expected.to contain_neutron_config('DEFAULT/kombu_ssl_keyfile').with_value('/path/to/ssl/keyfile')
-      is_expected.to contain_neutron_config('DEFAULT/kombu_ssl_version').with_value('TLSv1')
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('true')
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('/path/to/ssl/ca/certs')
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('/path/to/ssl/cert/file')
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('/path/to/ssl/keyfile')
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('TLSv1')
     end
   end
 
@@ -251,11 +251,11 @@ describe 'neutron' do
     end
 
     it do
-      is_expected.to contain_neutron_config('DEFAULT/rabbit_use_ssl').with_value('true')
-      is_expected.to contain_neutron_config('DEFAULT/kombu_ssl_ca_certs').with_ensure('absent')
-      is_expected.to contain_neutron_config('DEFAULT/kombu_ssl_certfile').with_ensure('absent')
-      is_expected.to contain_neutron_config('DEFAULT/kombu_ssl_keyfile').with_ensure('absent')
-      is_expected.to contain_neutron_config('DEFAULT/kombu_ssl_version').with_value('TLSv1')
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('true')
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_ensure('absent')
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_ensure('absent')
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_ensure('absent')
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('TLSv1')
     end
   end
 
@@ -268,11 +268,11 @@ describe 'neutron' do
     end
 
     it do
-      is_expected.to contain_neutron_config('DEFAULT/rabbit_use_ssl').with_value('false')
-      is_expected.to contain_neutron_config('DEFAULT/kombu_ssl_ca_certs').with_ensure('absent')
-      is_expected.to contain_neutron_config('DEFAULT/kombu_ssl_certfile').with_ensure('absent')
-      is_expected.to contain_neutron_config('DEFAULT/kombu_ssl_keyfile').with_ensure('absent')
-      is_expected.to contain_neutron_config('DEFAULT/kombu_ssl_version').with_ensure('absent')
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('false')
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_ensure('absent')
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_ensure('absent')
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_ensure('absent')
+      is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_ssl_version').with_ensure('absent')
     end
   end