openstack/puppet-aodh
Code Issues Proposed changes

Rename tenant to project

Browse Source 
... because in keystone v3 we use project instead of tenant.

Change-Id: I1e916839f5737a92e62bcc0fc7e0972a66cc7048
This commit is contained in:
Takashi Kajinami 2020-04-19 00:13:17 +09:00
parent ae4390b9ed
commit b756b9b4c8
3 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
manifests/auth.pp
View File

@ -17,7 +17,7 @@
# the keystone password for aodh services
# Required.
#
# [*auth_tenant_name*]
# [*auth_project_name*]
# the keystone tenant name for aodh services
# Optional. Defaults to 'services'
#
@ -29,10 +29,6 @@
# the keystone user domain name for aodh services
# Optional. Defaults to 'Default'
#
# [*auth_tenant_id*]
# the keystone tenant id for aodh services.
# Optional. Defaults to $::os_service_default.
#
# [*auth_type*]
# An authentication type to use with an OpenStack Identity server.
# The value should contain auth plugin name.
@ -57,33 +53,53 @@
# the keystone user domain id for aodh services
# Optional. Defaults to undef
#
# [*auth_tenant_name*]
# the keystone tenant name for aodh services
# Optional. Defaults to 'services'
#
# [*auth_tenant_id*]
# the keystone tenant id for aodh services.
# Optional. Defaults to $::os_service_default.
#
class aodh::auth (
$auth_password,
$auth_url = 'http://localhost:5000/v3',
$auth_region = 'RegionOne',
$auth_user = 'aodh',
$auth_tenant_name = 'services',
$auth_project_name = 'services',
$project_domain_name = 'Default',
$user_domain_name = 'Default',
$auth_type = 'password',
$auth_tenant_id = $::os_service_default,
$auth_cacert = $::os_service_default,
$interface = $::os_service_default,
# DEPRECATED PARAMETERS
$project_domain_id = undef,
$user_domain_id = undef,
$auth_tenant_name = undef,
$auth_tenant_id = undef,
) {
include aodh::deps
if $auth_tenant_name != undef {
warning('aodh::auth::auth_tenant_name is deprecated and will be removed \
in a future release. Use auth_project_name instead.')
$auth_project_name_real = $auth_tenant_name
} else {
$auth_project_name_real = $auth_project_name
}
if $auth_tenant_id != undef {
warning('aodh::auth::auth_tenant_id is deprecated and has no effect')
}
aodh_config {
'service_credentials/auth_url' : value => $auth_url;
'service_credentials/region_name' : value => $auth_region;
'service_credentials/username' : value => $auth_user;
'service_credentials/password' : value => $auth_password, secret => true;
'service_credentials/project_name' : value => $auth_tenant_name;
'service_credentials/project_name' : value => $auth_project_name_real;
'service_credentials/cacert' : value => $auth_cacert;
'service_credentials/tenant_id' : value => $auth_tenant_id;
'service_credentials/interface' : value => $interface;
'service_credentials/auth_type' : value => $auth_type;
}

8
releasenotes/notes/remove-tenant-d5fa563f15db0ba9.yaml Normal file
View File

@ -0,0 +1,8 @@
---
deprecations:
- |
The ``aodh::auth::tenant_name`` parameter is deprecated and will be removed
in a future release. Use ``aodh::auth:project_name`` instead.
- |
The ``aodh::auth::tenant_id`` parameter is deprecated and has no effect
now, since the actual parameter in aodh is no more valid.

10
spec/classes/aodh_auth_spec.rb
View File

@ -3,11 +3,11 @@ require 'spec_helper'
describe 'aodh::auth' do
let :params do
{ :auth_url => 'http://localhost:5000/v3',
:auth_region => 'RegionOne',
:auth_user => 'aodh',
:auth_password => 'password',
:auth_tenant_name => 'services',
{ :auth_url => 'http://localhost:5000/v3',
:auth_region => 'RegionOne',
:auth_user => 'aodh',
:auth_password => 'password',
:auth_project_name => 'services',
}
end