From e7330687baa66c3c8d55aeb581643e4a227b6568 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 13 Oct 2021 22:21:04 +0900 Subject: [PATCH] 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 --- manifests/network/neutron.pp | 6 ++++-- spec/classes/manila_network_neutron_spec.rb | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/manifests/network/neutron.pp b/manifests/network/neutron.pp index 2f4ef418..bebc7b6e 100644 --- a/manifests/network/neutron.pp +++ b/manifests/network/neutron.pp @@ -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; diff --git a/spec/classes/manila_network_neutron_spec.rb b/spec/classes/manila_network_neutron_spec.rb index fcbe083e..3fe07e4e 100644 --- a/spec/classes/manila_network_neutron_spec.rb +++ b/spec/classes/manila_network_neutron_spec.rb @@ -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')