Merge "Allow configuration of trust notifier"

This commit is contained in:
Jenkins 2017-07-20 12:49:36 +00:00 committed by Gerrit Code Review
commit 2308b456a6
3 changed files with 93 additions and 0 deletions

View File

@ -96,6 +96,7 @@ class zaqar(
if $auth_strategy == 'keystone' {
include ::zaqar::keystone::authtoken
include ::zaqar::keystone::trust
}
package { 'zaqar-common':

View File

@ -0,0 +1,51 @@
# == Class: zaqar::keystone::trust
#
# Configures zaqar trust notifier.
#
# === Parameters
#
# [*username*]
# (Optional) The name of the trust user
# Defaults to 'zaqar'
#
# [*password*]
# (Optional) Password to create for the trust user
# Defaults to $::os_service_default
#
# [*auth_url*]
# (Optional) The URL to use for authentication.
# Defaults to 'http://localhost:35357'
#
# [*user_domain_name*]
# (Optional) Name of domain for $username
# Defaults to $::os_service_default
#
# [*auth_section*]
# (Optional) Config Section from which to load plugin specific options
# Defaults to $::os_service_default.
#
# [*auth_type*]
# (Optional) Authentication type to load
# Defaults to 'password'
#
class zaqar::keystone::trust(
$username = 'zaqar',
$password = $::os_service_default,
$auth_url = 'http://localhost:35357',
$user_domain_name = $::os_service_default,
$auth_section = $::os_service_default,
$auth_type = 'password',
) {
include ::zaqar::deps
zaqar_config {
'trustee/username': value => $username;
'trustee/password': value => $password;
'trustee/user_domain_name': value => $user_domain_name;
'trustee/auth_url': value => $auth_url;
'trustee/auth_section': value => $auth_section;
'trustee/auth_type': value => $auth_type;
}
}

View File

@ -0,0 +1,41 @@
require 'spec_helper'
describe 'zaqar::keystone::trust' do
shared_examples_for 'zaqar::keystone::trust' do
describe 'with custom values' do
let :params do
{
:username => 'user',
:password => 'secret',
:auth_url => 'http://there',
:user_domain_name => 'domain',
:auth_section => 'keystone',
:auth_type => 'token',
}
end
it 'configures custom values' do
is_expected.to contain_zaqar_config('trustee/username').with_value('user')
is_expected.to contain_zaqar_config('trustee/password').with_value('secret')
is_expected.to contain_zaqar_config('trustee/auth_url').with_value('http://there')
is_expected.to contain_zaqar_config('trustee/user_domain_name').with_value('domain')
is_expected.to contain_zaqar_config('trustee/auth_section').with_value('keystone')
is_expected.to contain_zaqar_config('trustee/auth_type').with_value('token')
end
end
end
on_supported_os({
:supported_os => OSDefaults.get_supported_os
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts())
end
it_configures 'zaqar::keystone::trust'
end
end
end