openstack/puppet-nova
Code Issues Proposed changes

Merge "Make sure unused metadata parameters are cleared"

Browse Source
This commit is contained in:
Zuul
2022-04-26 09:26:17 +00:00
committed by Gerrit Code Review
parent ddc4d08090 3db9d7694e
commit e19ad53c7b
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/api.pp
View File

@@ -328,9 +328,15 @@ as a standalone service, or httpd for being run by a httpd server")
if !$nova_metadata_wsgi_enabled { if !$nova_metadata_wsgi_enabled {
nova_config { nova_config {
'DEFAULT/metadata_workers': value => $metadata_workers; 'DEFAULT/metadata_workers': value => $metadata_workers;
'DEFAULT/metadata_listen': value => $metadata_listen; 'DEFAULT/metadata_listen': value => $metadata_listen;
'DEFAULT/metadata_listen_port': value => $metadata_listen_port; 'DEFAULT/metadata_listen_port': value => $metadata_listen_port;
}
} else {
nova_config {
'DEFAULT/metadata_workers': ensure => absent;
'DEFAULT/metadata_listen': ensure => absent;
'DEFAULT/metadata_listen_port': ensure => absent;
} }
} }

10
spec/classes/nova_api_spec.rb
View File

@@ -221,8 +221,9 @@ describe 'nova::api' do
context 'when running nova API in wsgi for compute, and metadata in wsgi' do context 'when running nova API in wsgi for compute, and metadata in wsgi' do
before do before do
params.merge!({ params.merge!({
:service_name => 'httpd', :service_name => 'httpd',
:nova_metadata_wsgi_enabled => true }) :nova_metadata_wsgi_enabled => true
})
end end
let :pre_condition do let :pre_condition do
@@ -234,12 +235,15 @@ describe 'nova::api' do
end end
it 'disable nova API service' do it 'disable nova API service' do
is_expected.to contain_service('nova-api').with( is_expected.to contain_service('nova-api').with(
:ensure => 'stopped', :ensure => 'stopped',
:name => platform_params[:nova_api_service], :name => platform_params[:nova_api_service],
:enable => false, :enable => false,
:tag => 'nova-service', :tag => 'nova-service',
) )
is_expected.to contain_nova_config('DEFAULT/metadata_workers').with_ensure('absent')
is_expected.to contain_nova_config('DEFAULT/metadata_listen').with_ensure('absent')
is_expected.to contain_nova_config('DEFAULT/metadata_listen_port').with_ensure('absent')
end end
end end