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

6
manifests/api.pp
View File

@@ -332,6 +332,12 @@ as a standalone service, or httpd for being run by a httpd server")
'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;
}
} }
oslo::middleware {'nova_config': oslo::middleware {'nova_config':

6
spec/classes/nova_api_spec.rb
View File

@@ -222,7 +222,8 @@ describe 'nova::api' 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
@@ -240,6 +241,9 @@ describe 'nova::api' do
: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