diff --git a/manifests/cells.pp b/manifests/cells.pp
index 2c93d24c4..da66c01d5 100644
--- a/manifests/cells.pp
+++ b/manifests/cells.pp
@@ -171,11 +171,11 @@ class nova::cells (
   case $cell_type {
     'parent': {
       nova_config { 'DEFAULT/compute_api_class': value => 'nova.compute.cells_api.ComputeCellsAPI' }
-      nova_config { 'DEFAULT/cell_type': value         => 'api' }
+      nova_config { 'cells/cell_type': value         => 'api' }
     }
     'child': {
       nova_config { 'DEFAULT/quota_driver': value => 'nova.quota.NoopQuotaDriver' }
-      nova_config { 'DEFAULT/cell_type': value    => 'compute' }
+      nova_config { 'cells/cell_type': value    => 'compute' }
     }
     default: { fail("Unsupported cell_type parameter value: '${cell_type}'. Should be 'parent' or 'child'.") }
   }
diff --git a/spec/classes/nova_cells_spec.rb b/spec/classes/nova_cells_spec.rb
index 45328650f..f6e1a67ba 100644
--- a/spec/classes/nova_cells_spec.rb
+++ b/spec/classes/nova_cells_spec.rb
@@ -107,6 +107,7 @@ describe 'nova::cells' do
     end
     it { should contain_nova_config('cells/name').with_value(expected_params[:cell_name]) }
     it { should contain_nova_config('DEFAULT/compute_api_class').with_value('nova.compute.cells_api.ComputeCellsAPI')}
+    it { should contain_nova_config('cells/cell_type').with_value('api')}
     it_configures 'nova-cells'
   end
 
@@ -134,6 +135,7 @@ describe 'nova::cells' do
     end
     it { should contain_nova_config('cells/name').with_value(expected_params[:cell_name]) }
     it { should contain_nova_config('DEFAULT/quota_driver').with_value('nova.quota.NoopQuotaDriver')}
+    it { should contain_nova_config('cells/cell_type').with_value('compute')}
     it_configures 'nova-cells'
   end