diff --git a/manifests/compute.pp b/manifests/compute.pp
index fda44d2fe..c7f18d5e1 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -289,7 +289,7 @@ class nova::compute (
     nova_config {
       'compute/cpu_shared_set':    value => $cpu_shared_set_real;
       'compute/cpu_dedicated_set': value => $cpu_dedicated_set_real;
-      'compute/vcpu_pin_set':      value => $vcpu_pin_set_real;
+      'DEFAULT/vcpu_pin_set':      value => $vcpu_pin_set_real;
     }
   } else {
     # handle the following conditions:
@@ -300,7 +300,7 @@ class nova::compute (
     nova_config {
       'compute/cpu_shared_set':    value  => $cpu_shared_set_real;
       'compute/cpu_dedicated_set': value  => $cpu_dedicated_set_real;
-      'compute/vcpu_pin_set':      ensure => absent; # when undef, don't include in conf.
+      'DEFAULT/vcpu_pin_set':      ensure => absent; # when undef, don't include in conf.
     }
   }
 
diff --git a/spec/classes/nova_compute_spec.rb b/spec/classes/nova_compute_spec.rb
index 04d6deeea..509750e78 100644
--- a/spec/classes/nova_compute_spec.rb
+++ b/spec/classes/nova_compute_spec.rb
@@ -212,7 +212,7 @@ describe 'nova::compute' do
 
       it { is_expected.to contain_nova_config('compute/cpu_shared_set').with(:value => '4-12,^8,15') }
       it { is_expected.to contain_nova_config('compute/cpu_dedicated_set').with(:value => '2-10,^5,14') }
-      it { is_expected.to contain_nova_config('compute/vcpu_pin_set').with(:ensure => 'absent') }
+      it { is_expected.to contain_nova_config('DEFAULT/vcpu_pin_set').with(:ensure => 'absent') }
     end
 
     context 'when cpu_dedicated_set is defined but cpu_shared_set is not' do
@@ -222,7 +222,7 @@ describe 'nova::compute' do
 
       it { is_expected.to contain_nova_config('compute/cpu_dedicated_set').with(:value => '4-12,^8,15') }
       it { is_expected.to contain_nova_config('compute/cpu_shared_set').with(:value => '<SERVICE DEFAULT>') }
-      it { is_expected.to contain_nova_config('compute/vcpu_pin_set').with(:ensure => 'absent') }
+      it { is_expected.to contain_nova_config('DEFAULT/vcpu_pin_set').with(:ensure => 'absent') }
     end
 
     context 'when cpu_shared_set is defined, but cpu_dedicated_set and vcpu_pin_set are not' do
@@ -232,7 +232,7 @@ describe 'nova::compute' do
 
       it { is_expected.to contain_nova_config('compute/cpu_shared_set').with(:value => '4-12,^8,15') }
       it { is_expected.to contain_nova_config('compute/cpu_dedicated_set').with(:value => '<SERVICE DEFAULT>') }
-      it { is_expected.to contain_nova_config('compute/vcpu_pin_set').with(:ensure => 'absent') }
+      it { is_expected.to contain_nova_config('DEFAULT/vcpu_pin_set').with(:ensure => 'absent') }
     end
 
     context 'when cpu_shared_set and vcpu_pin_set are defined, but cpu_dedicated_set is not' do
@@ -242,7 +242,7 @@ describe 'nova::compute' do
       end
 
       it { is_expected.to contain_nova_config('compute/cpu_shared_set').with(:value => '4-12,^8,15') }
-      it { is_expected.to contain_nova_config('compute/vcpu_pin_set').with(:value => '2-10,^5,14') }
+      it { is_expected.to contain_nova_config('DEFAULT/vcpu_pin_set').with(:value => '2-10,^5,14') }
       it { is_expected.to contain_nova_config('compute/cpu_dedicated_set').with(:value => '<SERVICE DEFAULT>') }
     end
 
@@ -251,7 +251,7 @@ describe 'nova::compute' do
          { :vcpu_pin_set => ['4-12','^8','15'] }
       end
 
-      it { is_expected.to contain_nova_config('compute/vcpu_pin_set').with(:value => '4-12,^8,15') }
+      it { is_expected.to contain_nova_config('DEFAULT/vcpu_pin_set').with(:value => '4-12,^8,15') }
       it { is_expected.to contain_nova_config('compute/cpu_shared_set').with(:value => '<SERVICE DEFAULT>') }
       it { is_expected.to contain_nova_config('compute/cpu_dedicated_set').with(:value => '<SERVICE DEFAULT>') }
     end