Set the now-deprecated auth params to undef

Without these being set to undef, pick in authtoken manifest won't
work properly. This should solve that.

Change-Id: Id0d683037d232e7269e401d9b818aec09e5ed4ab
Closes-Bug: #1717281
This commit is contained in:
Brad P. Crochet
2017-09-13 11:11:16 -06:00
parent 7c3d77d2c7
commit 048d47a8de
2 changed files with 10 additions and 10 deletions

View File

@@ -205,19 +205,19 @@
#
# [*auth_uri*]
# (optional) Specifies the public Identity URI for Mistral to use.
# Default 'http://localhost:5000/'.
# Default undef.
#
# [*identity_uri*]
# (optional) Specifies the admin Identity URI for Mistral to use.
# Default 'http://localhost:35357/'.
# Default undef.
#
# [*keystone_user*]
# (optional) The name of the auth user
# Defaults to 'mistral'.
# Defaults to undef.
#
# [*keystone_tenant*]
# (optional) The tenant of the auth user
# Defaults to 'services'.
# Defaults to undef.
#
# [*keystone_password*]
# (optional) The password of the auth user.
@@ -263,10 +263,10 @@ class mistral(
$rabbit_virtual_host = $::os_service_default,
$rpc_backend = $::os_service_default,
$keystone_password = undef,
$keystone_user = 'mistral',
$keystone_tenant = 'services',
$auth_uri = 'http://localhost:5000/',
$identity_uri = 'http://localhost:35357/',
$keystone_user = undef,
$keystone_tenant = undef,
$auth_uri = undef,
$identity_uri = undef,
){
include ::mistral::deps

View File

@@ -53,10 +53,10 @@ describe 'mistral' do
is_expected.to contain_mistral_config('coordination/backend_url').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_mistral_config('coordination/heartbeat_interval').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_mistral_config('keystone_authtoken/auth_uri').with(
:value => 'http://localhost:5000/'
:value => 'http://localhost:5000'
)
is_expected.to contain_mistral_config('keystone_authtoken/auth_url').with(
:value => 'http://localhost:35357/'
:value => 'http://localhost:35357'
)
is_expected.to contain_mistral_config('keystone_authtoken/project_name').with(
:value => 'services'