openstack/puppet-octavia
Code Issues Proposed changes

deprecate bind_host, bind_port and auth_strategy options

Browse Source 
bind_host is deprecated for removal. Its value may be silently ignored
in the future.
Reason:	This setting has moved to the [api_settings] section.[0]

bind_port is deprecated for removal. Its value may be silently ignored
in the future.
Reason:	This setting has moved to the [api_settings] section.[1]

auth_strategy is deprecated for removal. Its value may be silently ignored
in the future.
Reason:	This setting has moved to the [api_settings] section.[2]

[0]https://docs.openstack.org/octavia/latest/configuration/configref.html#DEFAULT.bind_host
[1]https://docs.openstack.org/octavia/latest/configuration/configref.html#DEFAULT.bind_port
[2]https://docs.openstack.org/octavia/latest/configuration/configref.html#DEFAULT.auth_strategy

Change-Id: I30a8c6de07d2f70f398021209da5e517dd4e7fde
Closes-Bug: #1717192
This commit is contained in:
ZhongShengping 2017-09-14 15:29:26 +08:00
parent 79ad7af314
commit 240af51915
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/api.pp
View File

@ -76,9 +76,9 @@ class octavia::api (
}
octavia_config {
'DEFAULT/bind_host' : value => $host;
'DEFAULT/bind_port' : value => $port;
'DEFAULT/auth_strategy' : value => $auth_strategy;
'api_settings/bind_host' : value => $host;
'api_settings/bind_port' : value => $port;
'api_settings/auth_strategy' : value => $auth_strategy;
}
}

10
spec/classes/octavia_api_spec.rb
View File

@ -40,9 +40,9 @@ describe 'octavia::api' do
params.clear()
end
it 'configures with default values' do
is_expected.to contain_octavia_config('DEFAULT/bind_host').with_value( '0.0.0.0' )
is_expected.to contain_octavia_config('DEFAULT/bind_port').with_value( '9876' )
is_expected.to contain_octavia_config('DEFAULT/auth_strategy').with_value( 'keystone' )
is_expected.to contain_octavia_config('api_settings/bind_host').with_value( '0.0.0.0' )
is_expected.to contain_octavia_config('api_settings/bind_port').with_value( '9876' )
is_expected.to contain_octavia_config('api_settings/auth_strategy').with_value( 'keystone' )
end
it 'does not sync the database' do
is_expected.not_to contain_class('octavia::db::sync')
@ -50,8 +50,8 @@ describe 'octavia::api' do
end
it 'configures bind_host and bind_port' do
is_expected.to contain_octavia_config('DEFAULT/bind_host').with_value( params[:host] )
is_expected.to contain_octavia_config('DEFAULT/bind_port').with_value( params[:port] )
is_expected.to contain_octavia_config('api_settings/bind_host').with_value( params[:host] )
is_expected.to contain_octavia_config('api_settings/bind_port').with_value( params[:port] )
end
[{:enabled => true}, {:enabled => false}].each do |param_hash|