x
/
packstack
Code Issues Proposed changes

Drop usage of deprecated auth params for tempest 

Deprecated auth params for tempest are removed with
[1], let's drop it's usage and use valid params.

[1] https://review.opendev.org/c/openstack/puppet-tempest/+/806506

Change-Id: Ib2e67dc9527f00fc39fafebed68e7ebd47e9558e
This commit is contained in:
yatinkarel 2021-09-03 17:06:23 +05:30
parent 091b810f1a
commit 6479d15382
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packstack/puppet/modules/packstack/manifests/provision/tempest.pp
View File

@ -4,12 +4,12 @@ class packstack::provision::tempest ()
if $provision_demo {
$username = 'demo'
$password = hiera('CONFIG_KEYSTONE_DEMO_PW')
$tenant_name = 'demo'
$project_name = 'demo'
$floating_range = hiera('CONFIG_PROVISION_DEMO_FLOATRANGE')
} else {
$username = hiera('CONFIG_PROVISION_TEMPEST_USER')
$password = hiera('CONFIG_PROVISION_TEMPEST_USER_PW')
$tenant_name = 'tempest'
$project_name = 'tempest'
$floating_range = hiera('CONFIG_PROVISION_TEMPEST_FLOATRANGE')
}
@ -19,7 +19,7 @@ class packstack::provision::tempest ()
$auth_version = regsubst(hiera('CONFIG_KEYSTONE_API_VERSION'), '.0', '')
$admin_username = hiera('CONFIG_KEYSTONE_ADMIN_USERNAME')
$admin_password = hiera('CONFIG_KEYSTONE_ADMIN_PW')
$admin_tenant_name = 'admin'
$admin_project_name = 'admin'
$admin_domain_name = 'Default'
# get image and network id
@ -40,7 +40,7 @@ class packstack::provision::tempest ()
$resize_available = true
$change_password_available = undef
$allow_tenant_isolation = true
$use_dynamic_credentials = true
$dir_log = hiera('DIR_LOG')
$log_file = "${dir_log}/tempest.log"
$use_stderr = false
@ -106,9 +106,9 @@ class packstack::provision::tempest ()
class { 'tempest':
admin_domain_name => $admin_domain_name,
admin_password => $admin_password,
admin_tenant_name => $admin_tenant_name,
admin_project_name => $admin_project_name,
admin_username => $admin_username,
allow_tenant_isolation => $allow_tenant_isolation,
use_dynamic_credentials => $use_dynamic_credentials,
aodh_available => $aodh_available,
auth_version => $auth_version,
ceilometer_available => $ceilometer_available,
@ -141,7 +141,7 @@ class packstack::provision::tempest ()
swift_available => $swift_available,
tempest_workspace => $tempest_workspace,
install_from_source => false,
tenant_name => $tenant_name,
project_name => $project_name,
trove_available => $trove_available,
username => $username,
use_stderr => $use_stderr,