openstack/puppet-neutron
Code Issues Proposed changes

Merge "designate: Remove project_id parameter"

Browse Source
This commit is contained in:
Zuul 2022-04-26 10:14:47 +00:00 committed by Gerrit Code Review
commit af7a330bd1
3 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/designate.pp
View File

@ -62,13 +62,6 @@
# [*ptr_zone_email*]
# (optional) The email address to be used when creating PTR zones.
#
# DEPRECATED PARAMETERS
#
# [*project_id*]
# (optional) The UUID of the admin designate project. If provided this takes
# precedence over project_name.
# defaults to undef
#
class neutron::designate (
$password,
$url,
@ -85,22 +78,14 @@ class neutron::designate (
$ipv4_ptr_zone_prefix_size = $::os_service_default,
$ipv6_ptr_zone_prefix_size = $::os_service_default,
$ptr_zone_email = $::os_service_default,
# DEPRECATED PARAMETERS
$project_id = undef,
) {
include neutron::deps
include neutron::params
if $project_id != undef {
warning('The neutron::designate::project_id parmaeter is deprecated. Use the project_name parameter.')
}
if is_service_default($system_scope){
$project_id_real = pick($project_id, $::os_service_default)
$project_name_real = $project_name
$project_domain_name_real = $project_domain_name
} else {
$project_id_real = $::os_service_default
$project_name_real = $::os_service_default
$project_domain_name_real = $::os_service_default
}
@ -112,7 +97,6 @@ class neutron::designate (
'designate/auth_type': value => $auth_type;
'designate/username': value => $username;
'designate/user_domain_name': value => $user_domain_name;
'designate/project_id': value => $project_id_real;
'designate/project_name': value => $project_name_real;
'designate/project_domain_name': value => $project_domain_name_real;
'designate/system_scope': value => $system_scope;

4
releasenotes/notes/remove-project-id-ae722f30a3eb6d34.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The ``neutron::designate::project_id`` parameter has been removed.

5
spec/classes/neutron_designate_spec.rb
View File

@ -19,7 +19,6 @@ describe 'neutron::designate' do
should contain_neutron_config('designate/auth_type').with_value('password')
should contain_neutron_config('designate/username').with_value('neutron')
should contain_neutron_config('designate/user_domain_name').with_value('Default')
should contain_neutron_config('designate/project_id').with_value('<SERVICE DEFAULT>')
should contain_neutron_config('designate/project_name').with_value('services')
should contain_neutron_config('designate/project_domain_name').with_value('Default')
should contain_neutron_config('designate/system_scope').with_value('<SERVICE DEFAULT>')
@ -39,7 +38,6 @@ describe 'neutron::designate' do
:auth_type => 'v3password',
:username => 'alt_neutron',
:user_domain_name => 'Domain2',
:project_id => '53eceb0b-9913-4c0c-883d-3f43d90dcf9c',
:project_name => 'alt_service',
:project_domain_name => 'Domain1',
:auth_url => 'http://localhost:5000',
@ -59,7 +57,6 @@ describe 'neutron::designate' do
should contain_neutron_config('designate/auth_type').with_value('v3password')
should contain_neutron_config('designate/username').with_value('alt_neutron')
should contain_neutron_config('designate/user_domain_name').with_value('Domain2')
should contain_neutron_config('designate/project_id').with_value('53eceb0b-9913-4c0c-883d-3f43d90dcf9c')
should contain_neutron_config('designate/project_name').with_value('alt_service')
should contain_neutron_config('designate/project_domain_name').with_value('Domain1')
should contain_neutron_config('designate/system_scope').with_value('<SERVICE DEFAULT>')
@ -76,7 +73,6 @@ describe 'neutron::designate' do
context 'with system_scope' do
let :params do
req_params.merge!({
:project_id => 'id1',
:project_name => 'proj',
:project_domain_name => 'Domain1',
:system_scope => 'all',
@ -84,7 +80,6 @@ describe 'neutron::designate' do
end
it 'configures designate in neutron.conf' do
should contain_neutron_config('designate/project_id').with_value('<SERVICE DEFAULT>')
should contain_neutron_config('designate/project_name').with_value('<SERVICE DEFAULT>')
should contain_neutron_config('designate/project_domain_name').with_value('<SERVICE DEFAULT>')
should contain_neutron_config('designate/system_scope').with_value('all')