openstack
/
puppet-nova
Code Issues Proposed changes

Merge "Deprecate os_region_name option"

This commit is contained in:
Zuul 2018-04-13 16:22:53 +00:00 committed by Gerrit Code Review
parent 4076b2a48d b8e0b4a741
commit e30378db6c
3 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
manifests/placement.pp
View File

@ -27,7 +27,7 @@
# admin context through the OpenStack Identity service.
# Defaults to 'Default'
#
# [*os_region_name*]
# [*region_name*]
# (optional) Region name for connecting to Nova Placement API service in admin context
# through the OpenStack Identity service.
# Defaults to 'RegionOne'
@ -48,19 +48,35 @@
# and not the Identity service API IP and port.
# Defaults to 'http://127.0.0.1:35357/v3'
#
# DEPRECATED PARAMETERS
#
# [*os_region_name*]
# (optional) Region name for connecting to Nova Placement API service in admin context
# through the OpenStack Identity service.
# Defaults to undef
#
class nova::placement(
$password = false,
$auth_type = 'password',
$auth_url = 'http://127.0.0.1:35357/v3',
$os_region_name = 'RegionOne',
$region_name = 'RegionOne',
$os_interface = $::os_service_default,
$project_domain_name = 'Default',
$project_name = 'services',
$user_domain_name = 'Default',
$username = 'placement',
# DEPRECATED PARAMETERS
$os_region_name = undef,
) {
include ::nova::deps
if $os_region_name {
warning('The os_region_name parameter is deprecated and will be removed \
in a future release. Please use region_name instead.')
}
$region_name_real = pick($os_region_name, $region_name)
nova_config {
'placement/auth_type': value => $auth_type;
'placement/auth_url': value => $auth_url;
@ -69,7 +85,7 @@ class nova::placement(
'placement/project_name': value => $project_name;
'placement/user_domain_name': value => $user_domain_name;
'placement/username': value => $username;
'placement/os_region_name': value => $os_region_name;
'placement/region_name': value => $region_name_real;
'placement/os_interface': value => $os_interface;
}

4
releasenotes/notes/deprecate_os_region_name_parameter-a12b9e7b5d8cee38.yaml Normal file
View File

@ -0,0 +1,4 @@
---
deprecations:
- os_region_name is deprecated and will be removed in a future release.
Please region_name instead.

8
spec/classes/nova_placement_spec.rb
View File

@ -6,7 +6,7 @@ describe 'nova::placement' do
{ :auth_type => 'password',
:project_name => 'services',
:project_domain_name => 'Default',
:os_region_name => 'RegionOne',
:region_name => 'RegionOne',
:username => 'placement',
:user_domain_name => 'Default',
:auth_url => 'http://127.0.0.1:35357/v3',
@ -25,7 +25,7 @@ describe 'nova::placement' do
is_expected.to contain_nova_config('placement/auth_type').with_value(default_params[:auth_type])
is_expected.to contain_nova_config('placement/project_name').with_value(default_params[:project_name])
is_expected.to contain_nova_config('placement/project_domain_name').with_value(default_params[:project_domain_name])
is_expected.to contain_nova_config('placement/os_region_name').with_value(default_params[:os_region_name])
is_expected.to contain_nova_config('placement/region_name').with_value(default_params[:region_name])
is_expected.to contain_nova_config('placement/os_interface').with_value('<SERVICE DEFAULT>')
is_expected.to contain_nova_config('placement/username').with_value(default_params[:username])
is_expected.to contain_nova_config('placement/user_domain_name').with_value(default_params[:user_domain_name])
@ -39,7 +39,7 @@ describe 'nova::placement' do
:auth_type => 'password',
:project_name => 'service',
:project_domain_name => 'default',
:os_region_name => 'RegionTwo',
:region_name => 'RegionTwo',
:os_interface => 'internal',
:username => 'placement2',
:user_domain_name => 'default',
@ -52,7 +52,7 @@ describe 'nova::placement' do
is_expected.to contain_nova_config('placement/auth_type').with_value(params[:auth_type])
is_expected.to contain_nova_config('placement/project_name').with_value(params[:project_name])
is_expected.to contain_nova_config('placement/project_domain_name').with_value(params[:project_domain_name])
is_expected.to contain_nova_config('placement/os_region_name').with_value(params[:os_region_name])
is_expected.to contain_nova_config('placement/region_name').with_value(params[:region_name])
is_expected.to contain_nova_config('placement/os_interface').with_value(params[:os_interface])
is_expected.to contain_nova_config('placement/username').with_value(params[:username])
is_expected.to contain_nova_config('placement/user_domain_name').with_value(params[:user_domain_name])