Removes deprecated neutron auth options and tests
Change-Id: Ib9ae12347999d6d566418522765610c8a3496727
This commit is contained in:
parent
c47cf92e6a
commit
1e49acf26d
|
@ -140,12 +140,6 @@ class nova::network::neutron (
|
|||
$vif_plugging_timeout = '300',
|
||||
$dhcp_domain = 'novalocal',
|
||||
$default_floating_pool = 'nova',
|
||||
# DEPRECATED PARAMETERS
|
||||
$neutron_admin_password = false,
|
||||
$neutron_auth_strategy = undef,
|
||||
$neutron_admin_tenant_name = undef,
|
||||
$neutron_admin_username = undef,
|
||||
$neutron_admin_auth_url = undef,
|
||||
$neutron_default_tenant_id = undef,
|
||||
$neutron_auth_plugin = undef,
|
||||
$neutron_ca_certificates_file = undef,
|
||||
|
@ -153,67 +147,6 @@ class nova::network::neutron (
|
|||
|
||||
include ::nova::deps
|
||||
|
||||
# neutron_admin params removed in Mitaka
|
||||
if $neutron_password {
|
||||
$neutron_password_real = $neutron_password
|
||||
} else {
|
||||
if $neutron_admin_password {
|
||||
warning('neutron_admin_password is deprecated. Use neutron_password')
|
||||
$neutron_password_real = $neutron_admin_password
|
||||
} else {
|
||||
fail('neutron_password is required')
|
||||
}
|
||||
}
|
||||
|
||||
# neutron_auth_plugin deprecated in Newton
|
||||
if $neutron_auth_plugin {
|
||||
warning('neutron_auth_plugin parameter is deprecated and will be removed in a future release, use neutron_auth_type instead.')
|
||||
$neutron_auth_type_real = $neutron_auth_plugin
|
||||
} else {
|
||||
$neutron_auth_type_real = $neutron_auth_type
|
||||
}
|
||||
|
||||
if $neutron_admin_tenant_name {
|
||||
warning('neutron_admin_tenant_name is deprecated. Use neutron_project_name')
|
||||
$neutron_project_name_real = $neutron_admin_tenant_name
|
||||
} else {
|
||||
$neutron_project_name_real = $neutron_project_name
|
||||
}
|
||||
|
||||
if $neutron_admin_username {
|
||||
warning('neutron_admin_username is deprecated. Use neutron_username')
|
||||
$neutron_username_real = $neutron_admin_username
|
||||
} else {
|
||||
$neutron_username_real = $neutron_username
|
||||
}
|
||||
|
||||
if $neutron_admin_auth_url {
|
||||
warning('neutron_admin_auth_url is deprecated. Use neutron_auth_url')
|
||||
$neutron_auth_url_real = $neutron_admin_auth_url
|
||||
} else {
|
||||
$neutron_auth_url_real = $neutron_auth_url
|
||||
}
|
||||
|
||||
# neutron_auth_strategy removed in Mitaka
|
||||
if $neutron_auth_strategy {
|
||||
warning('neutron_auth_strategy is deprecated')
|
||||
}
|
||||
nova_config {
|
||||
'neutron/auth_strategy': ensure => absent;
|
||||
}
|
||||
|
||||
# neutron_default_tenant_id removed in Mitaka
|
||||
# the parameter is deprecated but still can be used if needed
|
||||
if $neutron_default_tenant_id {
|
||||
warning('neutron_default_tenant_id is deprecated')
|
||||
nova_config {
|
||||
'neutron/default_tenant_id': value => $neutron_default_tenant_id;
|
||||
}
|
||||
} else {
|
||||
nova_config {
|
||||
'neutron/default_tenant_id': ensure => absent;
|
||||
}
|
||||
}
|
||||
|
||||
$default_floating_pool_real = pick($::nova::api::default_floating_pool, $default_floating_pool)
|
||||
|
||||
|
@ -225,20 +158,16 @@ class nova::network::neutron (
|
|||
'neutron/default_floating_pool': value => $default_floating_pool_real;
|
||||
'neutron/url': value => $neutron_url;
|
||||
'neutron/timeout': value => $neutron_url_timeout;
|
||||
'neutron/project_name': value => $neutron_project_name_real;
|
||||
'neutron/project_name': value => $neutron_project_name;
|
||||
'neutron/project_domain_name': value => $neutron_project_domain_name;
|
||||
'neutron/region_name': value => $neutron_region_name;
|
||||
'neutron/username': value => $neutron_username_real;
|
||||
'neutron/username': value => $neutron_username;
|
||||
'neutron/user_domain_name': value => $neutron_user_domain_name;
|
||||
'neutron/password': value => $neutron_password_real, secret => true;
|
||||
'neutron/auth_url': value => $neutron_auth_url_real;
|
||||
'neutron/password': value => $neutron_password, secret => true;
|
||||
'neutron/auth_url': value => $neutron_auth_url;
|
||||
'neutron/ovs_bridge': value => $neutron_ovs_bridge;
|
||||
'neutron/extension_sync_interval': value => $neutron_extension_sync_interval;
|
||||
'neutron/auth_type': value => $neutron_auth_type_real;
|
||||
}
|
||||
|
||||
if $neutron_ca_certificates_file {
|
||||
warning('neutron_ca_certificates_file parameter is deprecated, has no effect and will be dropped in a future release.')
|
||||
'neutron/auth_type': value => $neutron_auth_type;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
---
|
||||
upgrade:
|
||||
- Removes deprecated Neutron "neutron_admin_*" auth options.
|
|
@ -41,7 +41,6 @@ describe 'nova::network::neutron' do
|
|||
is_expected.to contain_nova_config('neutron/user_domain_name').with_value(default_params[:neutron_user_domain_name])
|
||||
is_expected.to contain_nova_config('neutron/auth_url').with_value(default_params[:neutron_auth_url])
|
||||
is_expected.to contain_nova_config('neutron/extension_sync_interval').with_value(default_params[:neutron_extension_sync_interval])
|
||||
is_expected.to contain_nova_config('neutron/default_tenant_id').with_ensure('absent')
|
||||
end
|
||||
it 'configures Nova to use Neutron Bridge Security Groups and Firewall' do
|
||||
is_expected.to contain_nova_config('DEFAULT/firewall_driver').with_value(default_params[:firewall_driver])
|
||||
|
@ -75,7 +74,6 @@ describe 'nova::network::neutron' do
|
|||
end
|
||||
|
||||
it 'configures neutron endpoint in nova.conf' do
|
||||
is_expected.to contain_nova_config('neutron/auth_strategy').with_ensure('absent')
|
||||
is_expected.to contain_nova_config('neutron/password').with_value(params[:neutron_password]).with_secret(true)
|
||||
is_expected.to contain_nova_config('DEFAULT/dhcp_domain').with_value(params[:dhcp_domain])
|
||||
is_expected.to contain_nova_config('neutron/default_floating_pool').with_value(params[:default_floating_pool])
|
||||
|
@ -88,7 +86,6 @@ describe 'nova::network::neutron' do
|
|||
is_expected.to contain_nova_config('neutron/user_domain_name').with_value(params[:neutron_user_domain_name])
|
||||
is_expected.to contain_nova_config('neutron/auth_url').with_value(params[:neutron_auth_url])
|
||||
is_expected.to contain_nova_config('neutron/extension_sync_interval').with_value(params[:neutron_extension_sync_interval])
|
||||
is_expected.to contain_nova_config('neutron/default_tenant_id').with_ensure('absent')
|
||||
end
|
||||
it 'configures Nova to use Neutron Security Groups and Firewall' do
|
||||
is_expected.to contain_nova_config('DEFAULT/firewall_driver').with_value(params[:firewall_driver])
|
||||
|
@ -105,34 +102,23 @@ describe 'nova::network::neutron' do
|
|||
params.merge!(
|
||||
:neutron_url => 'http://10.0.0.1:9696',
|
||||
:neutron_url_timeout => '30',
|
||||
:neutron_admin_tenant_name => 'openstack',
|
||||
:neutron_default_tenant_id => 'default',
|
||||
:neutron_region_name => 'RegionTwo',
|
||||
:neutron_admin_username => 'neutron2',
|
||||
:neutron_admin_auth_url => 'http://10.0.0.1:35357',
|
||||
:firewall_driver => 'nova.virt.firewall.IptablesFirewallDriver',
|
||||
:neutron_ovs_bridge => 'br-int',
|
||||
:neutron_extension_sync_interval => '600',
|
||||
:vif_plugging_is_fatal => false,
|
||||
:vif_plugging_timeout => '0',
|
||||
:dhcp_domain => 'foo',
|
||||
:neutron_auth_plugin => 'oldparam',
|
||||
)
|
||||
end
|
||||
|
||||
it 'configures neutron endpoint in nova.conf' do
|
||||
is_expected.to contain_nova_config('neutron/auth_strategy').with_ensure('absent')
|
||||
is_expected.to contain_nova_config('neutron/password').with_value(params[:neutron_password]).with_secret(true)
|
||||
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/timeout').with_value(params[:neutron_url_timeout])
|
||||
is_expected.to contain_nova_config('neutron/project_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])
|
||||
is_expected.to contain_nova_config('neutron/username').with_value(params[:neutron_admin_username])
|
||||
is_expected.to contain_nova_config('neutron/auth_url').with_value(params[:neutron_admin_auth_url])
|
||||
is_expected.to contain_nova_config('neutron/extension_sync_interval').with_value(params[:neutron_extension_sync_interval])
|
||||
is_expected.to contain_nova_config('neutron/auth_type').with_value(params[:neutron_auth_plugin])
|
||||
end
|
||||
it 'configures Nova to use Neutron Security Groups and Firewall' do
|
||||
is_expected.to contain_nova_config('DEFAULT/firewall_driver').with_value(params[:firewall_driver])
|
||||
|
|
Loading…
Reference in New Issue