openstack
/
puppet-manila
Code Issues Proposed changes

Do not set [DEFAULT] network_api_class 

... because the network_api_class parameter is no longer effective in
the [DEFAULT] section and it should be defined in each backend section
instead[1].

[1] 5af3b8e68b5d5351b3a53114d179a78ba1bf466f

Change-Id: I96d4b3434e3650253fcde86069e30500b27184dd
This commit is contained in:
Takashi Kajinami 2021-10-13 22:21:04 +09:00
parent ba2c17d64e
commit e7330687ba
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/network/neutron.pp
View File

@ -79,10 +79,12 @@ class manila::network::neutron (
$network_plugin_ipv6_enabled = $::os_service_default,
) {
$neutron_plugin_name = 'manila.network.neutron.neutron_network_plugin.NeutronNetworkPlugin'
# TODO(tkajinam): Remove this after Yoga release
manila_config {
'DEFAULT/network_api_class': ensure => absent;
}
manila_config {
'DEFAULT/network_api_class': value => $neutron_plugin_name;
'neutron/insecure': value => $insecure;
'neutron/auth_url': value => $auth_url;
'neutron/auth_type': value => $auth_type;

1
spec/classes/manila_network_neutron_spec.rb
View File

@ -39,7 +39,6 @@ describe 'manila::network::neutron' do
end
it 'configures manila neutron with overridden parameters' do
is_expected.to contain_manila_config('DEFAULT/network_api_class').with_value('manila.network.neutron.neutron_network_plugin.NeutronNetworkPlugin')
is_expected.to contain_manila_config('neutron/insecure').with_value(true)
is_expected.to contain_manila_config('neutron/auth_url').with_value('http://127.0.0.2:5000/')
is_expected.to contain_manila_config('neutron/auth_type').with_value('v3password')