Move barbican to authtoken
Create a new class to handle all configuration for keystone_authtoken section in configuration file using keystone::resource::authtoken This patch is not backward compatible: - we have change auth_type in api.pp to auth_strategy, because auth_type is related to keystone authentication. - removed all parameters related to keystone_authtoken from api.pp and moved to authtoken.pp Change-Id: I2dee8a3d1c399234941f96d8f21f49526777f501 Depends-On: I94914ed5a8b5c1447606547b31ed46bb72b4de01 Related-Bug: #1604463
This commit is contained in:
Iury Gregory Melo Ferreira
parent
b0af1334cd
commit
0df44cb07c
|
|
@ -168,14 +168,10 @@
|
|||
# (string value)
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*auth_type*]
|
||||
# [*auth_strategy*]
|
||||
# (optional) authentication type
|
||||
# Defaults to 'keystone'
|
||||
#
|
||||
# [*auth_url*]
|
||||
# (optional) identity server URI, needed for keystone auth
|
||||
# Defaults to 'http://localhost:35357'
|
||||
#
|
||||
# [*manage_service*]
|
||||
# (optional) If Puppet should manage service startup / shutdown.
|
||||
# Defaults to true.
|
||||
|
|
@ -184,25 +180,6 @@
|
|||
# (optional) Whether to enable services.
|
||||
# Defaults to true.
|
||||
#
|
||||
# [*keystone_password*]
|
||||
# (required) Password used to authentication.
|
||||
#
|
||||
# [*keystone_tenant*]
|
||||
# (optional) Tenant to authenticate to.
|
||||
# Defaults to 'services'.
|
||||
#
|
||||
# [*keystone_user*]
|
||||
# (optional) User to authenticate as with keystone.
|
||||
# Defaults to 'barbican'.
|
||||
#
|
||||
# [*project_domain_id*]
|
||||
# (optional) Auth user project's domain ID
|
||||
# Defaults to 'default'
|
||||
#
|
||||
# [*user_domain_id*]
|
||||
# (optional) Auth user's domain ID
|
||||
# Defaults to 'default'
|
||||
#
|
||||
# [*sync_db*]
|
||||
# (optional) Run barbican-db-manage on api nodes.
|
||||
# Defaults to true
|
||||
|
|
@ -237,9 +214,21 @@
|
|||
# (optional) CA certificate file to use to verify connecting clients
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*keystone_auth_type*]
|
||||
# (optional) An authentication plugin to use with an OpenStack Identity server.
|
||||
# Defaults to 'password'
|
||||
# === DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*keystone_password*]
|
||||
# (optional) DEPRECATED. Use barbican::keystone::authtoken::password
|
||||
# instead.
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*auth_url*]
|
||||
# (optional) DEPRECATED. Use barbican::keystone::authtoken::auth_url
|
||||
# instead.
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*auth_type*]
|
||||
# (optional) DEPRECATED. Use auth_strategy instead.
|
||||
# Defaults to undef
|
||||
#
|
||||
class barbican::api (
|
||||
$ensure_package = 'present',
|
||||
|
|
@ -278,13 +267,7 @@ class barbican::api (
|
|||
$kombu_ssl_version = $::os_service_default,
|
||||
$kombu_reconnect_delay = $::os_service_default,
|
||||
$kombu_compression = $::os_service_default,
|
||||
$auth_type = 'keystone',
|
||||
$auth_url = 'http://localhost:35357',
|
||||
$keystone_password = undef,
|
||||
$keystone_tenant = 'services',
|
||||
$keystone_user = 'barbican',
|
||||
$project_domain_id = 'default',
|
||||
$user_domain_id = 'default',
|
||||
$auth_strategy = 'keystone',
|
||||
$manage_service = true,
|
||||
$enabled = true,
|
||||
$sync_db = true,
|
||||
|
|
@ -294,13 +277,32 @@ class barbican::api (
|
|||
$cert_file = $::os_service_default,
|
||||
$key_file = $::os_service_default,
|
||||
$service_name = 'barbican-api',
|
||||
$keystone_auth_type = 'password',
|
||||
# DEPRECATED
|
||||
$auth_type = undef,
|
||||
$keystone_password = undef,
|
||||
$auth_url = undef,
|
||||
) inherits barbican::params {
|
||||
|
||||
|
||||
include ::barbican::db
|
||||
include ::barbican::api::logging
|
||||
include ::barbican::client
|
||||
|
||||
if $auth_type {
|
||||
warning('auth_type is deprecated and will be removed, use auth_strategy instead')
|
||||
$auth_strategy_real = $auth_type
|
||||
} else {
|
||||
$auth_strategy_real = $auth_strategy
|
||||
}
|
||||
|
||||
if $keystone_password {
|
||||
warning('keystone_password is deprecated, use barbican::keystone::authtoken::password instead.')
|
||||
}
|
||||
|
||||
if $auth_url {
|
||||
warning('auth_url is deprecated, use barbican::keystone::authtoken::auth_url instead.')
|
||||
}
|
||||
|
||||
file { ['/etc/barbican', '/var/log/barbican']:
|
||||
ensure => directory,
|
||||
require => Package['barbican-api'],
|
||||
|
|
@ -410,24 +412,14 @@ class barbican::api (
|
|||
}
|
||||
|
||||
# keystone config
|
||||
if $auth_type == 'keystone' {
|
||||
if $keystone_password == undef {
|
||||
fail('keystone_password must be defined')
|
||||
}
|
||||
if $auth_strategy_real == 'keystone' {
|
||||
|
||||
include ::barbican::keystone::authtoken
|
||||
|
||||
barbican_api_paste_ini {
|
||||
'pipeline:barbican_api/pipeline': value => 'cors authtoken context apiapp';
|
||||
}
|
||||
|
||||
barbican_config {
|
||||
'keystone_authtoken/auth_type': value => $keystone_auth_type;
|
||||
'keystone_authtoken/auth_url': value => $auth_url;
|
||||
'keystone_authtoken/project_name': value => $keystone_tenant;
|
||||
'keystone_authtoken/username': value => $keystone_user;
|
||||
'keystone_authtoken/password': value => $keystone_password, secret => true;
|
||||
'keystone_authtoken/user_domain_id': value => $user_domain_id;
|
||||
'keystone_authtoken/project_domain_id': value => $project_domain_id;
|
||||
}
|
||||
} else {
|
||||
barbican_api_paste_ini {
|
||||
'pipeline:barbican_api/pipeline': value => 'cors unauthenticated-context apiapp';
|
||||
|
|
|
|||
|
|
@ -0,0 +1,270 @@
|
|||
# class: barbican::keystone::authtoken
|
||||
#
|
||||
# Configure the keystone_authtoken section in the configuration file
|
||||
#
|
||||
# === Parameters
|
||||
#
|
||||
# [*username*]
|
||||
# (Optional) The name of the service user
|
||||
# Defaults to 'barbican'
|
||||
#
|
||||
# [*password*]
|
||||
# (Optional) Password to create for the service user
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*auth_url*]
|
||||
# (Optional) The URL to use for authentication.
|
||||
# Defaults to 'http://localhost:35357'
|
||||
#
|
||||
# [*project_name*]
|
||||
# (Optional) Service project name
|
||||
# Defaults to 'services'
|
||||
#
|
||||
# [*user_domain_name*]
|
||||
# (Optional) Name of domain for $username
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*project_domain_name*]
|
||||
# (Optional) Name of domain for $project_name
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*insecure*]
|
||||
# (Optional) If true, explicitly allow TLS without checking server cert
|
||||
# against any certificate authorities. WARNING: not recommended. Use with
|
||||
# caution.
|
||||
# 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'
|
||||
#
|
||||
# [*auth_uri*]
|
||||
# (Optional) Complete public Identity API endpoint.
|
||||
# Defaults to 'http://localhost:5000'
|
||||
#
|
||||
# [*auth_version*]
|
||||
# (Optional) API version of the admin Identity API endpoint.
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*cache*]
|
||||
# (Optional) Env key for the swift cache.
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*cafile*]
|
||||
# (Optional) A PEM encoded Certificate Authority to use when verifying HTTPs
|
||||
# connections.
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*certfile*]
|
||||
# (Optional) Required if identity server requires client certificate
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*check_revocations_for_cached*]
|
||||
# (Optional) If true, the revocation list will be checked for cached tokens.
|
||||
# This requires that PKI tokens are configured on the identity server.
|
||||
# boolean value.
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*delay_auth_decision*]
|
||||
# (Optional) Do not handle authorization requests within the middleware, but
|
||||
# delegate the authorization decision to downstream WSGI components. Boolean
|
||||
# value
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*enforce_token_bind*]
|
||||
# (Optional) Used to control the use and type of token binding. Can be set
|
||||
# to: "disabled" to not check token binding. "permissive" (default) to
|
||||
# validate binding information if the bind type is of a form known to the
|
||||
# server and ignore it if not. "strict" like "permissive" but if the bind
|
||||
# type is unknown the token will be rejected. "required" any form of token
|
||||
# binding is needed to be allowed. Finally the name of a binding method that
|
||||
# must be present in tokens. String value.
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*hash_algorithms*]
|
||||
# (Optional) Hash algorithms to use for hashing PKI tokens. This may be a
|
||||
# single algorithm or multiple. The algorithms are those supported by Python
|
||||
# standard hashlib.new(). The hashes will be tried in the order given, so put
|
||||
# the preferred one first for performance. The result of the first hash will
|
||||
# be stored in the cache. This will typically be set to multiple values only
|
||||
# while migrating from a less secure algorithm to a more secure one. Once all
|
||||
# the old tokens are expired this option should be set to a single value for
|
||||
# better performance. List value.
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*http_connect_timeout*]
|
||||
# (Optional) Request timeout value for communicating with Identity API
|
||||
# server.
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*http_request_max_retries*]
|
||||
# (Optional) How many times are we trying to reconnect when communicating
|
||||
# with Identity API Server. Integer value
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*include_service_catalog*]
|
||||
# (Optional) Indicate whether to set the X-Service-Catalog header. If False,
|
||||
# middleware will not ask for service catalog on token validation and will
|
||||
# not set the X-Service-Catalog header. Boolean value.
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*keyfile*]
|
||||
# (Optional) Required if identity server requires client certificate
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*memcache_pool_conn_get_timeout*]
|
||||
# (Optional) Number of seconds that an operation will wait to get a memcached
|
||||
# client connection from the pool. Integer value
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*memcache_pool_dead_retry*]
|
||||
# (Optional) Number of seconds memcached server is considered dead before it
|
||||
# is tried again. Integer value
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*memcache_pool_maxsize*]
|
||||
# (Optional) Maximum total number of open connections to every memcached
|
||||
# server. Integer value
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*memcache_pool_socket_timeout*]
|
||||
# (Optional) Number of seconds a connection to memcached is held unused in
|
||||
# the pool before it is closed. Integer value
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*memcache_pool_unused_timeout*]
|
||||
# (Optional) Number of seconds a connection to memcached is held unused in
|
||||
# the pool before it is closed. Integer value
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*memcache_secret_key*]
|
||||
# (Optional, mandatory if memcache_security_strategy is defined) This string
|
||||
# is used for key derivation.
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*memcache_security_strategy*]
|
||||
# (Optional) If defined, indicate whether token data should be authenticated
|
||||
# or authenticated and encrypted. If MAC, token data is authenticated (with
|
||||
# HMAC) in the cache. If ENCRYPT, token data is encrypted and authenticated in the
|
||||
# cache. If the value is not one of these options or empty, auth_token will
|
||||
# raise an exception on initialization.
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*memcache_use_advanced_pool*]
|
||||
# (Optional) Use the advanced (eventlet safe) memcached client pool. The
|
||||
# advanced pool will only work under python 2.x Boolean value
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*memcached_servers*]
|
||||
# (Optional) Optionally specify a list of memcached server(s) to use for
|
||||
# caching. If left undefined, tokens will instead be cached in-process.
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*region_name*]
|
||||
# (Optional) The region in which the identity server can be found.
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*revocation_cache_time*]
|
||||
# (Optional) Determines the frequency at which the list of revoked tokens is
|
||||
# retrieved from the Identity service (in seconds). A high number of
|
||||
# revocation events combined with a low cache duration may significantly
|
||||
# reduce performance. Only valid for PKI tokens. Integer value
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*signing_dir*]
|
||||
# (Optional) Directory used to cache files related to PKI tokens.
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*token_cache_time*]
|
||||
# (Optional) In order to prevent excessive effort spent validating tokens,
|
||||
# the middleware caches previously-seen tokens for a configurable duration
|
||||
# (in seconds). Set to -1 to disable caching completely. Integer value
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
class barbican::keystone::authtoken(
|
||||
$password = $::os_service_default,
|
||||
$username = 'barbican',
|
||||
$auth_url = 'http://localhost:35357',
|
||||
$project_name = 'services',
|
||||
$user_domain_name = $::os_service_default,
|
||||
$project_domain_name = $::os_service_default,
|
||||
$insecure = $::os_service_default,
|
||||
$auth_section = $::os_service_default,
|
||||
$auth_type = 'password',
|
||||
$auth_uri = 'http://localhost:5000',
|
||||
$auth_version = $::os_service_default,
|
||||
$cache = $::os_service_default,
|
||||
$cafile = $::os_service_default,
|
||||
$certfile = $::os_service_default,
|
||||
$check_revocations_for_cached = $::os_service_default,
|
||||
$delay_auth_decision = $::os_service_default,
|
||||
$enforce_token_bind = $::os_service_default,
|
||||
$hash_algorithms = $::os_service_default,
|
||||
$http_connect_timeout = $::os_service_default,
|
||||
$http_request_max_retries = $::os_service_default,
|
||||
$include_service_catalog = $::os_service_default,
|
||||
$keyfile = $::os_service_default,
|
||||
$memcache_pool_conn_get_timeout = $::os_service_default,
|
||||
$memcache_pool_dead_retry = $::os_service_default,
|
||||
$memcache_pool_maxsize = $::os_service_default,
|
||||
$memcache_pool_socket_timeout = $::os_service_default,
|
||||
$memcache_pool_unused_timeout = $::os_service_default,
|
||||
$memcache_secret_key = $::os_service_default,
|
||||
$memcache_security_strategy = $::os_service_default,
|
||||
$memcache_use_advanced_pool = $::os_service_default,
|
||||
$memcached_servers = $::os_service_default,
|
||||
$region_name = $::os_service_default,
|
||||
$revocation_cache_time = $::os_service_default,
|
||||
$signing_dir = $::os_service_default,
|
||||
$token_cache_time = $::os_service_default,
|
||||
) {
|
||||
|
||||
if is_service_default($password) and ! $::barbican::api::keystone_password {
|
||||
fail('Please set password for barbican service user')
|
||||
}
|
||||
|
||||
$password_real = pick($::barbican::api::keystone_password, $password)
|
||||
$auth_url_real = pick($::barbican::api::auth_url, $auth_url)
|
||||
|
||||
keystone::resource::authtoken { 'barbican_config':
|
||||
username => $username,
|
||||
password => $password_real,
|
||||
project_name => $project_name,
|
||||
auth_url => $auth_url_real,
|
||||
auth_uri => $auth_uri,
|
||||
auth_version => $auth_version,
|
||||
auth_type => $auth_type,
|
||||
auth_section => $auth_section,
|
||||
user_domain_name => $user_domain_name,
|
||||
project_domain_name => $project_domain_name,
|
||||
insecure => $insecure,
|
||||
cache => $cache,
|
||||
cafile => $cafile,
|
||||
certfile => $certfile,
|
||||
check_revocations_for_cached => $check_revocations_for_cached,
|
||||
delay_auth_decision => $delay_auth_decision,
|
||||
enforce_token_bind => $enforce_token_bind,
|
||||
hash_algorithms => $hash_algorithms,
|
||||
http_connect_timeout => $http_connect_timeout,
|
||||
http_request_max_retries => $http_request_max_retries,
|
||||
include_service_catalog => $include_service_catalog,
|
||||
keyfile => $keyfile,
|
||||
memcache_pool_conn_get_timeout => $memcache_pool_conn_get_timeout,
|
||||
memcache_pool_dead_retry => $memcache_pool_dead_retry,
|
||||
memcache_pool_maxsize => $memcache_pool_maxsize,
|
||||
memcache_pool_socket_timeout => $memcache_pool_socket_timeout,
|
||||
memcache_secret_key => $memcache_secret_key,
|
||||
memcache_security_strategy => $memcache_security_strategy,
|
||||
memcache_use_advanced_pool => $memcache_use_advanced_pool,
|
||||
memcache_pool_unused_timeout => $memcache_pool_unused_timeout,
|
||||
memcached_servers => $memcached_servers,
|
||||
region_name => $region_name,
|
||||
revocation_cache_time => $revocation_cache_time,
|
||||
signing_dir => $signing_dir,
|
||||
token_cache_time => $token_cache_time,
|
||||
}
|
||||
}
|
||||
|
|
@ -36,13 +36,16 @@ describe 'barbican::api basic test class' do
|
|||
database_connection => 'mysql+pymysql://barbican:a_big_secret@127.0.0.1/barbican?charset=utf8',
|
||||
}
|
||||
|
||||
class { '::barbican::keystone::authtoken':
|
||||
password => 'a_big_secret',
|
||||
}
|
||||
|
||||
class { '::barbican::api':
|
||||
host_href => 'http://localhost:9311',
|
||||
auth_type => 'keystone',
|
||||
keystone_password => 'a_big_secret',
|
||||
service_name => 'httpd',
|
||||
enabled_certificate_plugins => ['simple_certificate'],
|
||||
db_auto_create => false,
|
||||
host_href => 'http://localhost:9311',
|
||||
auth_strategy => 'keystone',
|
||||
service_name => 'httpd',
|
||||
enabled_certificate_plugins => ['simple_certificate'],
|
||||
db_auto_create => false,
|
||||
}
|
||||
|
||||
include ::apache
|
||||
|
|
|
|||
|
|
@ -45,18 +45,13 @@ describe 'barbican::api' do
|
|||
:enabled_crypto_plugins => ['<SERVICE DEFAULT>'],
|
||||
:enabled_certificate_plugins => ['<SERVICE DEFAULT>'],
|
||||
:enabled_certificate_event_plugins => ['<SERVICE DEFAULT>'],
|
||||
:auth_type => 'keystone',
|
||||
:auth_url => 'http://localhost:35357',
|
||||
:keystone_password => 'foo',
|
||||
:auth_strategy => 'keystone',
|
||||
:retry_scheduler_initial_delay_seconds => '<SERVICE DEFAULT>',
|
||||
:retry_scheduler_periodic_interval_max_seconds => '<SERVICE DEFAULT>',
|
||||
}
|
||||
end
|
||||
|
||||
[{
|
||||
:keystone_password => 'foo',
|
||||
},
|
||||
{
|
||||
:bind_host => '127.0.0.1',
|
||||
:bind_port => '9312',
|
||||
:rpc_backend => 'rabbit',
|
||||
|
|
@ -91,12 +86,13 @@ describe 'barbican::api' do
|
|||
:retry_scheduler_periodic_interval_max_seconds => 20.0,
|
||||
:max_allowed_secret_in_bytes => 20000,
|
||||
:max_allowed_request_size_in_bytes => 2000000,
|
||||
:auth_url => 'https://keystone.example.com:35357',
|
||||
:keystone_password => 'bar',
|
||||
}
|
||||
].each do |param_set|
|
||||
|
||||
describe "when #{param_set == {} ? "using default" : "specifying"} class parameters" do
|
||||
let :pre_condition do
|
||||
'class { "barbican::keystone::authtoken": password => "secret", }'
|
||||
end
|
||||
|
||||
let :param_hash do
|
||||
default_params.merge(param_set)
|
||||
|
|
@ -172,13 +168,16 @@ describe 'barbican::api' do
|
|||
end
|
||||
|
||||
describe 'with SSL socket options set' do
|
||||
let :pre_condition do
|
||||
'class { "barbican::keystone::authtoken": password => "secret", }'
|
||||
end
|
||||
|
||||
let :params do
|
||||
{
|
||||
:use_ssl => true,
|
||||
:cert_file => '/path/to/cert',
|
||||
:ca_file => '/path/to/ca',
|
||||
:key_file => '/path/to/key',
|
||||
:keystone_password => 'foobar',
|
||||
:use_ssl => true,
|
||||
:cert_file => '/path/to/cert',
|
||||
:ca_file => '/path/to/ca',
|
||||
:key_file => '/path/to/key',
|
||||
}
|
||||
end
|
||||
|
||||
|
|
@ -188,10 +187,13 @@ describe 'barbican::api' do
|
|||
end
|
||||
|
||||
describe 'with SSL socket options left by default' do
|
||||
let :pre_condition do
|
||||
'class { "barbican::keystone::authtoken": password => "secret", }'
|
||||
end
|
||||
|
||||
let :params do
|
||||
{
|
||||
:use_ssl => false,
|
||||
:keystone_password => 'foobar',
|
||||
:use_ssl => false,
|
||||
}
|
||||
end
|
||||
|
||||
|
|
@ -201,12 +203,15 @@ describe 'barbican::api' do
|
|||
end
|
||||
|
||||
describe 'with SSL socket options set wrongly configured' do
|
||||
let :pre_condition do
|
||||
'class { "barbican::keystone::authtoken": password => "secret", }'
|
||||
end
|
||||
|
||||
let :params do
|
||||
{
|
||||
:use_ssl => true,
|
||||
:ca_file => '/path/to/ca',
|
||||
:key_file => '/path/to/key',
|
||||
:keystone_password => 'foobar',
|
||||
:use_ssl => true,
|
||||
:ca_file => '/path/to/ca',
|
||||
:key_file => '/path/to/key',
|
||||
}
|
||||
end
|
||||
|
||||
|
|
@ -214,23 +219,20 @@ describe 'barbican::api' do
|
|||
end
|
||||
|
||||
describe 'with keystone auth' do
|
||||
let :pre_condition do
|
||||
'class { "barbican::keystone::authtoken": password => "secret", }'
|
||||
end
|
||||
|
||||
let :params do
|
||||
{
|
||||
:auth_type => 'keystone',
|
||||
:keystone_password => 'foobar',
|
||||
:keystone_auth_type => 'passwordv3',
|
||||
:auth_strategy => 'keystone',
|
||||
}
|
||||
end
|
||||
|
||||
it 'is_expected.to set keystone params correctly' do
|
||||
is_expected.to contain_barbican_api_paste_ini('pipeline:barbican_api/pipeline')\
|
||||
.with_value('cors authtoken context apiapp')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/auth_url')\
|
||||
.with_value('http://localhost:35357')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/project_name')\
|
||||
.with_value('services')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/auth_type')\
|
||||
.with_value('passwordv3')
|
||||
is_expected.to contain_class('barbican::keystone::authtoken')
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -239,7 +241,7 @@ describe 'barbican::api' do
|
|||
{
|
||||
:manage_service => false,
|
||||
:enabled => false,
|
||||
:auth_type => 'None',
|
||||
:auth_strategy => 'None',
|
||||
}
|
||||
end
|
||||
|
||||
|
|
@ -253,6 +255,10 @@ describe 'barbican::api' do
|
|||
end
|
||||
|
||||
describe 'on RedHat platforms' do
|
||||
let :pre_condition do
|
||||
'class { "barbican::keystone::authtoken": password => "secret", }'
|
||||
end
|
||||
|
||||
let :facts do
|
||||
OSDefaults.get_facts({
|
||||
:osfamily => 'RedHat',
|
||||
|
|
|
|||
|
|
@ -0,0 +1,145 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe 'barbican::keystone::authtoken' do
|
||||
|
||||
let :params do
|
||||
{ :password => 'barbican_password', }
|
||||
end
|
||||
|
||||
shared_examples 'barbican authtoken' do
|
||||
|
||||
context 'with default parameters' do
|
||||
|
||||
it 'configure keystone_authtoken' do
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/username').with_value('barbican')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/password').with_value('barbican_password')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/auth_url').with_value('http://localhost:35357')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/project_name').with_value('services')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/user_domain_name').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/project_domain_name').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/insecure').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/auth_section').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/auth_type').with_value('password')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/auth_uri').with_value('http://localhost:5000')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/auth_version').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/cache').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/cafile').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/certfile').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/check_revocations_for_cached').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/delay_auth_decision').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/enforce_token_bind').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/hash_algorithms').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/http_connect_timeout').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/http_request_max_retries').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/include_service_catalog').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/keyfile').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/memcache_pool_conn_get_timeout').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/memcache_pool_dead_retry').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/memcache_pool_maxsize').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/memcache_pool_socket_timeout').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/memcache_pool_unused_timeout').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/memcache_secret_key').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/memcache_security_strategy').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/memcache_use_advanced_pool').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/memcached_servers').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/region_name').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/revocation_cache_time').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/signing_dir').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
|
||||
end
|
||||
end
|
||||
|
||||
context 'when overriding parameters' do
|
||||
before do
|
||||
params.merge!({
|
||||
:auth_uri => 'https://10.0.0.1:9999/',
|
||||
:username => 'myuser',
|
||||
:password => 'mypasswd',
|
||||
:auth_url => 'http://:127.0.0.1:35357',
|
||||
:project_name => 'service_project',
|
||||
:user_domain_name => 'domainX',
|
||||
:project_domain_name => 'domainX',
|
||||
:insecure => false,
|
||||
:auth_section => 'new_section',
|
||||
:auth_type => 'password',
|
||||
:auth_version => 'v3',
|
||||
:cache => 'somevalue',
|
||||
:cafile => '/opt/stack/data/cafile.pem',
|
||||
:certfile => 'certfile.crt',
|
||||
:check_revocations_for_cached => false,
|
||||
:delay_auth_decision => false,
|
||||
:enforce_token_bind => 'permissive',
|
||||
:hash_algorithms => 'md5',
|
||||
:http_connect_timeout => '300',
|
||||
:http_request_max_retries => '3',
|
||||
:include_service_catalog => true,
|
||||
:keyfile => 'keyfile',
|
||||
:memcache_pool_conn_get_timeout => '9',
|
||||
:memcache_pool_dead_retry => '302',
|
||||
:memcache_pool_maxsize => '11',
|
||||
:memcache_pool_socket_timeout => '2',
|
||||
:memcache_pool_unused_timeout => '61',
|
||||
:memcache_secret_key => 'secret_key',
|
||||
:memcache_security_strategy => 'ENCRYPT',
|
||||
:memcache_use_advanced_pool => true,
|
||||
:memcached_servers => ['memcached01:11211','memcached02:11211'],
|
||||
:region_name => 'region2',
|
||||
:revocation_cache_time => '11',
|
||||
:signing_dir => '/var/cache',
|
||||
:token_cache_time => '301',
|
||||
})
|
||||
end
|
||||
|
||||
it 'configure keystone_authtoken' do
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/auth_uri').with_value('https://10.0.0.1:9999/')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/username').with_value(params[:username])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/password').with_value(params[:password]).with_secret(true)
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/auth_url').with_value(params[:auth_url])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/project_name').with_value(params[:project_name])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/user_domain_name').with_value(params[:user_domain_name])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/project_domain_name').with_value(params[:project_domain_name])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/insecure').with_value(params[:insecure])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/auth_section').with_value(params[:auth_section])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/auth_type').with_value(params[:auth_type])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/auth_version').with_value(params[:auth_version])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/cache').with_value(params[:cache])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/cafile').with_value(params[:cafile])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/certfile').with_value(params[:certfile])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/check_revocations_for_cached').with_value(params[:check_revocations_for_cached])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/delay_auth_decision').with_value(params[:delay_auth_decision])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/enforce_token_bind').with_value(params[:enforce_token_bind])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/hash_algorithms').with_value(params[:hash_algorithms])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/http_connect_timeout').with_value(params[:http_connect_timeout])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/http_request_max_retries').with_value(params[:http_request_max_retries])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/include_service_catalog').with_value(params[:include_service_catalog])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/keyfile').with_value(params[:keyfile])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/memcache_pool_conn_get_timeout').with_value(params[:memcache_pool_conn_get_timeout])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/memcache_pool_dead_retry').with_value(params[:memcache_pool_dead_retry])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/memcache_pool_maxsize').with_value(params[:memcache_pool_maxsize])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/memcache_pool_socket_timeout').with_value(params[:memcache_pool_socket_timeout])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/memcache_pool_unused_timeout').with_value(params[:memcache_pool_unused_timeout])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/memcache_secret_key').with_value(params[:memcache_secret_key])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/memcache_security_strategy').with_value(params[:memcache_security_strategy])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/memcache_use_advanced_pool').with_value(params[:memcache_use_advanced_pool])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211')
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/region_name').with_value(params[:region_name])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/revocation_cache_time').with_value(params[:revocation_cache_time])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/signing_dir').with_value(params[:signing_dir])
|
||||
is_expected.to contain_barbican_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
|
||||
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 'barbican authtoken'
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
|
@ -21,7 +21,6 @@ describe 'barbican::plugins::dogtag' do
|
|||
:dogtag_plugin_simple_cmc_profile => '<SERVICE DEFAULT>',
|
||||
:dogtag_plugin_ca_expiration_time => '<SERVICE DEFAULT>',
|
||||
:dogtag_plugin_plugin_working_dir => '<SERVICE DEFAULT>',
|
||||
:keystone_password => 'password',
|
||||
}
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue