openstack
/
puppet-placement
Code Issues Proposed changes

Merge "Make password optional within placement::keystone::authtoken"

This commit is contained in:
Zuul 2019-01-26 03:11:54 +00:00 committed by Gerrit Code Review
parent da05e0b932 21a2d682ef
commit fbf3257800
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/keystone/authtoken.pp
View File

@ -9,7 +9,8 @@
# Defaults to 'placement'
#
# [*password*]
# (Required) Password to create for the service user
# (Optional) Password to create for the service user
# Defaults to $::os_service_default.
#
# [*auth_url*]
# (Optional) The URL to use for authentication.
@ -161,8 +162,8 @@
# Defaults to $::os_service_default.
#
class placement::keystone::authtoken(
$password,
$username = 'placement',
$password = $::os_service_default,
$auth_url = 'http://localhost:5000',
$project_name = 'services',
$user_domain_name = 'Default',

3
spec/classes/placement_keystone_authtoken_spec.rb
View File

@ -3,7 +3,6 @@ require 'spec_helper'
describe 'placement::keystone::authtoken' do
let :params do
{
:password => 'secrete',
}
end
@ -11,7 +10,7 @@ describe 'placement::keystone::authtoken' do
context 'with default parameters' do
it {
is_expected.to contain_placement_config('keystone_authtoken/username').with_value('placement')
is_expected.to contain_placement_config('keystone_authtoken/password').with_value('secrete')
is_expected.to contain_placement_config('keystone_authtoken/password').with_value('<SERVICE DEFAULT>')
is_expected.to contain_placement_config('keystone_authtoken/auth_url').with_value('http://localhost:5000')
is_expected.to contain_placement_config('keystone_authtoken/project_name').with_value('services')
is_expected.to contain_placement_config('keystone_authtoken/user_domain_name').with_value('Default')