diff --git a/manifests/all.pp b/manifests/all.pp
index a733c54..d7fdb7f 100644
--- a/manifests/all.pp
+++ b/manifests/all.pp
@@ -284,8 +284,8 @@ class openstack::all (
     class { 'nova::compute::quantum': }
 
     nova_config {
-      'linuxnet_interface_driver':       value => 'nova.network.linux_net.LinuxOVSInterfaceDriver';
-      'linuxnet_ovs_integration_bridge': value => 'br-int';
+      'DEFAULT/linuxnet_interface_driver':       value => 'nova.network.linux_net.LinuxOVSInterfaceDriver';
+      'DEFAULT/linuxnet_ovs_integration_bridge': value => 'br-int';
     }
 
     class { 'quantum::plugins::ovs':
@@ -315,7 +315,7 @@ class openstack::all (
   }
 
   if $auto_assign_floating_ip {
-    nova_config { 'auto_assign_floating_ip': value => 'True' }
+    nova_config { 'DEFUALT/auto_assign_floating_ip': value => 'True' }
   }
 
   class { [
diff --git a/manifests/compute.pp b/manifests/compute.pp
index 6e838e8..39324ad 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -118,8 +118,8 @@ class openstack::compute (
     if $multi_host {
       include keystone::python
       nova_config {
-        'multi_host':      value => 'True';
-        'send_arp_for_ha': value => 'True';
+        'DEFAULT/multi_host':      value => 'True';
+        'DEFAULT/send_arp_for_ha': value => 'True';
       }
       if ! $public_interface {
         fail('public_interface must be defined for multi host compute nodes')
@@ -135,8 +135,8 @@ class openstack::compute (
     } else {
       $enable_network_service = false
       nova_config {
-        'multi_host':      value => 'False';
-        'send_arp_for_ha': value => 'False';
+        'DEFAULT/multi_host':      value => 'False';
+        'DEFAULT/send_arp_for_ha': value => 'False';
       }
     }
 
@@ -195,8 +195,8 @@ class openstack::compute (
     }
 
     nova_config {
-      'linuxnet_interface_driver':       value => 'nova.network.linux_net.LinuxOVSInterfaceDriver';
-      'linuxnet_ovs_integration_bridge': value => 'br-int';
+      'DEFAULT/linuxnet_interface_driver':       value => 'nova.network.linux_net.LinuxOVSInterfaceDriver';
+      'DEFAULT/linuxnet_ovs_integration_bridge': value => 'br-int';
     }
   }
 
@@ -214,8 +214,8 @@ class openstack::compute (
     }
 
     # set in nova::api
-    if ! defined(Nova_config['volume_api_class']) {
-      nova_config { 'volume_api_class': value => 'nova.volume.cinder.API' }
+    if ! defined(Nova_config['DEFAULT/volume_api_class']) {
+      nova_config { 'DEFAULT/volume_api_class': value => 'nova.volume.cinder.API' }
     }
   } else {
     # Set up nova-volume
diff --git a/manifests/nova/controller.pp b/manifests/nova/controller.pp
index f6dd736..1a50af7 100644
--- a/manifests/nova/controller.pp
+++ b/manifests/nova/controller.pp
@@ -120,7 +120,7 @@ class openstack::nova::controller (
   if $quantum == false {
     # Configure nova-network
     if $multi_host {
-      nova_config { 'multi_host': value => 'True' }
+      nova_config { 'DEFAULT/multi_host': value => 'True' }
       $enable_network_service = false
     } else {
       if $enabled {
@@ -193,7 +193,7 @@ class openstack::nova::controller (
   }
 
   if $auto_assign_floating_ip {
-    nova_config { 'auto_assign_floating_ip': value => 'True' }
+    nova_config { 'DEFAULT/auto_assign_floating_ip': value => 'True' }
   }
 
   # a bunch of nova services that require no configuration
diff --git a/spec/classes/openstack_compute_spec.rb b/spec/classes/openstack_compute_spec.rb
index e23b4d3..92dc138 100644
--- a/spec/classes/openstack_compute_spec.rb
+++ b/spec/classes/openstack_compute_spec.rb
@@ -49,8 +49,8 @@ describe 'openstack::compute' do
         :libvirt_type     => 'kvm',
         :vncserver_listen => '0.0.0.0'
       )
-      should contain_nova_config('multi_host').with( :value => 'False' )
-      should contain_nova_config('send_arp_for_ha').with( :value => 'False' )
+      should contain_nova_config('DEFAULT/multi_host').with( :value => 'False' )
+      should contain_nova_config('DEFAULT/send_arp_for_ha').with( :value => 'False' )
       should_not contain_class('nova::api')
       should contain_class('nova::network').with({
         :enabled           => false,
@@ -111,8 +111,8 @@ describe 'openstack::compute' do
         :libvirt_type     => 'qemu',
         :vncserver_listen => '127.0.0.1'
       )
-      should contain_nova_config('multi_host').with( :value => 'False' )
-      should contain_nova_config('send_arp_for_ha').with( :value => 'False' )
+      should contain_nova_config('DEFAULT/multi_host').with( :value => 'False' )
+      should contain_nova_config('DEFAULT/send_arp_for_ha').with( :value => 'False' )
       should_not contain_class('nova::api')
       should contain_class('nova::network').with({
         :enabled           => false,
@@ -134,7 +134,7 @@ describe 'openstack::compute' do
     end
 
     it do
-      should contain_nova_config('multi_host').with({ 'value' => 'False'})
+      should contain_nova_config('DEFAULT/multi_host').with({ 'value' => 'False'})
       should_not contain_class('nova::api')
       should contain_class('nova::network').with({
         'enabled' => false,
@@ -155,8 +155,8 @@ describe 'openstack::compute' do
 
       it 'should configure nova for multi-host' do
         #should contain_class('keystone::python')
-        should contain_nova_config('multi_host').with(:value => 'True')
-        should contain_nova_config('send_arp_for_ha').with( :value => 'True')
+        should contain_nova_config('DEFAULT/multi_host').with(:value => 'True')
+        should contain_nova_config('DEFAULT/send_arp_for_ha').with( :value => 'True')
         should contain_class('nova::network').with({
           'enabled' => true,
           'install_service' => true
@@ -220,7 +220,7 @@ describe 'openstack::compute' do
     end
 
     it {
-      should contain_nova_config('multi_host').with({ 'value' => 'True'})
+      should contain_nova_config('DEFAULT/multi_host').with({ 'value' => 'True'})
       should contain_class('nova::api')
       should contain_class('nova::network').with({
         'enabled' => true,
diff --git a/spec/classes/openstack_controller_spec.rb b/spec/classes/openstack_controller_spec.rb
index 7abc586..a9dd5be 100644
--- a/spec/classes/openstack_controller_spec.rb
+++ b/spec/classes/openstack_controller_spec.rb
@@ -359,13 +359,13 @@ describe 'openstack::controller' do
         should contain_class('nova::objectstore').with(:enabled => true)
         should contain_class('nova::vncproxy').with(:enabled => true)
       end
-      it { should_not contain_nova_config('auto_assign_floating_ip') }
+      it { should_not contain_nova_config('DEFAULT/auto_assign_floating_ip') }
     end
     context 'when auto assign floating ip is assigned' do
       let :params do
         default_params.merge(:auto_assign_floating_ip => 'true')
       end
-      it { should contain_nova_config('auto_assign_floating_ip').with(:value => 'True')}
+      it { should contain_nova_config('DEFAULT/auto_assign_floating_ip').with(:value => 'True')}
     end
     context 'when not enabled' do
       let :params do
@@ -546,7 +546,7 @@ describe 'openstack::controller' do
         let :params do
           default_params.merge(:quantum => false, :multi_host => true)
         end
-        it { should contain_nova_config('multi_host').with(:value => 'True')}
+        it { should contain_nova_config('DEFAULT/multi_host').with(:value => 'True')}
         it {should contain_class('nova::network').with(
           :create_networks   => true,
           :enabled           => false,