openstack/puppet-nova
Code Issues Proposed changes

Correct section for cell_type nova.conf parameter

Browse Source 
Move the cell_type parameter to the [cells] section, from the
[DEFAULT] section.

Change-Id: I711aa640726cba76a0cb64ae685b9c3e282f8395
Closes-bug: 1403174
This commit is contained in:
Mike Dorman
2014-12-16 12:20:02 -07:00
parent e5934ce389
commit a744554e4a
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/cells.pp
View File

@@ -171,11 +171,11 @@ class nova::cells (
case $cell_type { case $cell_type {
'parent': { 'parent': {
nova_config { 'DEFAULT/compute_api_class': value => 'nova.compute.cells_api.ComputeCellsAPI' } 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': { 'child': {
nova_config { 'DEFAULT/quota_driver': value => 'nova.quota.NoopQuotaDriver' } 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'.") } default: { fail("Unsupported cell_type parameter value: '${cell_type}'. Should be 'parent' or 'child'.") }
} }

2
spec/classes/nova_cells_spec.rb
View File

@@ -107,6 +107,7 @@ describe 'nova::cells' do
end end
it { should contain_nova_config('cells/name').with_value(expected_params[:cell_name]) } 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('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' it_configures 'nova-cells'
end end
@@ -134,6 +135,7 @@ describe 'nova::cells' do
end end
it { should contain_nova_config('cells/name').with_value(expected_params[:cell_name]) } 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('DEFAULT/quota_driver').with_value('nova.quota.NoopQuotaDriver')}
it { should contain_nova_config('cells/cell_type').with_value('compute')}
it_configures 'nova-cells' it_configures 'nova-cells'
end end