openstack
/
puppet-nova
Code Issues Proposed changes

rename neuton/url_timeout to neutron/timeout 

The config name was changed in Kilo and produces deprecation warnings:
"Option "url_timeout" from group "neutron" is deprecated. Use option
"timeout" from group "neutron"

Change-Id: I1c8945f3393f8de1a38ad10a4f17eb63229d8517
This commit is contained in:
Matt Fischer 2015-09-29 08:38:40 -06:00
parent 0d57b76bf6
commit a5462fa89f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/network/neutron.pp
View File

@ -121,7 +121,7 @@ class nova::network::neutron (
'DEFAULT/vif_plugging_timeout': value => $vif_plugging_timeout;
'neutron/auth_strategy': value => $neutron_auth_strategy;
'neutron/url': value => $neutron_url;
'neutron/url_timeout': value => $neutron_url_timeout;
'neutron/timeout': value => $neutron_url_timeout;
'neutron/admin_tenant_name': value => $neutron_admin_tenant_name;
'neutron/default_tenant_id': value => $neutron_default_tenant_id;
'neutron/region_name': value => $neutron_region_name;

4
spec/classes/nova_network_neutron_spec.rb
View File

@ -33,7 +33,7 @@ describe 'nova::network::neutron' do
is_expected.to contain_nova_config('DEFAULT/dhcp_domain').with_value(default_params[:dhcp_domain])
is_expected.to contain_nova_config('neutron/auth_strategy').with_value(default_params[:neutron_auth_strategy])
is_expected.to contain_nova_config('neutron/url').with_value(default_params[:neutron_url])
is_expected.to contain_nova_config('neutron/url_timeout').with_value(default_params[:neutron_url_timeout])
is_expected.to contain_nova_config('neutron/timeout').with_value(default_params[:neutron_url_timeout])
is_expected.to contain_nova_config('neutron/admin_tenant_name').with_value(default_params[:neutron_admin_tenant_name])
is_expected.to contain_nova_config('neutron/default_tenant_id').with_value(default_params[:neutron_default_tenant_id])
is_expected.to contain_nova_config('neutron/region_name').with_value(default_params[:neutron_region_name])
@ -79,7 +79,7 @@ describe 'nova::network::neutron' do
is_expected.to contain_nova_config('DEFAULT/network_api_class').with_value('network.api.class')
is_expected.to contain_nova_config('DEFAULT/dhcp_domain').with_value(params[:dhcp_domain])
is_expected.to contain_nova_config('neutron/url').with_value(params[:neutron_url])
is_expected.to contain_nova_config('neutron/url_timeout').with_value(params[:neutron_url_timeout])
is_expected.to contain_nova_config('neutron/timeout').with_value(params[:neutron_url_timeout])
is_expected.to contain_nova_config('neutron/admin_tenant_name').with_value(params[:neutron_admin_tenant_name])
is_expected.to contain_nova_config('neutron/default_tenant_id').with_value(params[:neutron_default_tenant_id])
is_expected.to contain_nova_config('neutron/region_name').with_value(params[:neutron_region_name])