openstack
/
puppet-neutron
Code Issues Proposed changes

Merge "Provide config class interface for rootwrap.conf"

This commit is contained in:
Zuul 2024-01-22 17:21:23 +00:00 committed by Gerrit Code Review
parent 3ea19aaea1 19b9345599
commit 68cceacff2
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/config.pp
View File

@ -27,6 +27,9 @@
# [*api_paste_ini*]
# (optional) Manage configuration of api-paste.ini
#
# [*rootwrap_config*]
# (optional) Allow configuration of rootwrap.conf configurations.
#
# [*ovs_agent_config*]
# (optional) Manage configuration of openvswitch_agent.ini
#
@ -101,6 +104,7 @@
class neutron::config (
Hash $server_config = {},
Hash $api_paste_ini = {},
Hash $rootwrap_config = {},
Hash $ovs_agent_config = {},
Hash $ovn_agent_config = {},
Hash $sriov_agent_config = {},
@ -148,6 +152,7 @@ class neutron::config (
create_resources('neutron_config', $server_config)
create_resources('neutron_api_paste_ini', $api_paste_ini)
create_resources('neutron_rootwrap_config', $rootwrap_config)
create_resources('neutron_agent_ovs', $ovs_agent_config)
create_resources('neutron_agent_ovn', $ovn_agent_config)
create_resources('neutron_sriov_agent_config', $sriov_agent_config)

4
releasenotes/notes/config-rootwrap_config-dc7cc63b57426226.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
The new ``neutron::config::rootwrap_config`` parameter has been added.

18
spec/classes/neutron_config_spec.rb
View File

@ -27,13 +27,28 @@ describe 'neutron::config' do
{ :api_paste_ini => config_hash }
end
it 'configures arbitrary neutron-api-config configurations' do
it 'configures arbitrary neutron-api-paste configurations' do
should contain_neutron_api_paste_ini('DEFAULT/foo').with_value('fooValue')
should contain_neutron_api_paste_ini('DEFAULT/bar').with_value('barValue')
should contain_neutron_api_paste_ini('DEFAULT/baz').with_ensure('absent')
end
end
shared_examples 'neutron_rootwrap_config' do
let :params do
{ :rootwrap_config => config_hash }
end
it { should contain_class('neutron::deps') }
it 'configures arbitrary rootwrap configurations' do
should contain_neutron_rootwrap_config('DEFAULT/foo').with_value('fooValue')
should contain_neutron_rootwrap_config('DEFAULT/bar').with_value('barValue')
should contain_neutron_rootwrap_config('DEFAULT/baz').with_ensure('absent')
end
end
shared_examples 'neutron_service_config' do
let :params do
{ :sfc_service_config => config_hash,
@ -191,6 +206,7 @@ describe 'neutron::config' do
it_behaves_like 'neutron_config'
it_behaves_like 'neutron_api_paste_ini'
it_behaves_like 'neutron_rootwrap_config'
it_behaves_like 'neutron_service_config'
it_behaves_like 'neutron_agent_config'
it_behaves_like 'neutron_plugin_config'