Keystone authoken resource change
Create a new class to handle the keystone authtoken configuration utilizing the keystone::resource::authtoken resource. Some deprecations: - gnocchi::api::keystone_user is deprecated in favor of gnocchi::keystone::authtoken::username. - gnocchi::api::keystone_password is deprecated in favor of gnocchi::keystone::authtoken::password. - gnocchi::api::keystone_tenant is deprecated in favor of gnocchi::keystone::authtoken::project_name - gnocchi::api::keystone_identity_uri is deprecated in favor of gnocchi::keystone::authtoken::auth_url. - gnocchi::api::keystone_auth_uri is deprecated in favor of gnocchi::keystone::authtoken::auth_uri Change-Id: I7be1c8f471472e74642e25508c6871d0f948d75b Related-Bug: #1604463
This commit is contained in:
Matthew J. Black
Iury Gregory Melo Ferreira
parent
0c1f61b7c6
commit
c79055bf22
|
|
@ -26,13 +26,23 @@ class Puppet::Provider::Gnocchi < Puppet::Provider
|
|||
end
|
||||
|
||||
def self.get_gnocchi_credentials
|
||||
auth_keys = ['auth_host', 'auth_port', 'auth_protocol',
|
||||
'admin_tenant_name', 'admin_user', 'admin_password']
|
||||
auth_keys = ['auth_uri', 'project_name', 'username', 'password']
|
||||
conf = gnocchi_conf
|
||||
if conf and conf['keystone_authtoken'] and
|
||||
auth_keys.all?{|k| !conf['keystone_authtoken'][k].nil?}
|
||||
return Hash[ auth_keys.map \
|
||||
creds = Hash[ auth_keys.map \
|
||||
{ |k| [k, conf['keystone_authtoken'][k].strip] } ]
|
||||
if !conf['keystone_authtoken']['project_domain_name'].nil?
|
||||
creds['project_domain_name'] = conf['keystone_authtoken']['project_domain_name'].strip
|
||||
else
|
||||
creds['project_domain_name'] = 'Default'
|
||||
end
|
||||
if !conf['keystone_authtoken']['user_domain_name'].nil?
|
||||
creds['user_domain_name'] = conf['keystone_authtoken']['user_domain_name'].strip
|
||||
else
|
||||
creds['user_domain_name'] = 'Default'
|
||||
end
|
||||
return creds
|
||||
else
|
||||
raise(Puppet::Error, "File: #{conf_filename} does not contain all \
|
||||
required sections. Gnocchi types will not work if gnocchi is not \
|
||||
|
|
@ -44,15 +54,6 @@ correctly configured.")
|
|||
self.class.gnocchi_credentials
|
||||
end
|
||||
|
||||
def self.auth_endpoint
|
||||
@auth_endpoint ||= get_auth_endpoint
|
||||
end
|
||||
|
||||
def self.get_auth_endpoint
|
||||
q = gnocchi_credentials
|
||||
"#{q['auth_protocol']}://#{q['auth_host']}:#{q['auth_port']}/v2.0/"
|
||||
end
|
||||
|
||||
def self.gnocchi_conf
|
||||
return @gnocchi_conf if @gnocchi_conf
|
||||
@gnocchi_conf = Puppet::Util::IniConfig::File.new
|
||||
|
|
@ -63,10 +64,12 @@ correctly configured.")
|
|||
def self.auth_gnocchi(*args)
|
||||
q = gnocchi_credentials
|
||||
authenv = {
|
||||
:OS_AUTH_URL => self.auth_endpoint,
|
||||
:OS_USERNAME => q['admin_user'],
|
||||
:OS_TENANT_NAME => q['admin_tenant_name'],
|
||||
:OS_PASSWORD => q['admin_password']
|
||||
:OS_AUTH_URL => q['auth_uri'],
|
||||
:OS_USERNAME => q['username'],
|
||||
:OS_TENANT_NAME => q['project_name'],
|
||||
:OS_PASSWORD => q['password'],
|
||||
:OS_PROJECT_DOMAIN_NAME => q['project_domain_name'],
|
||||
:OS_USER_DOMAIN_NAME => q['user_domain_name'],
|
||||
}
|
||||
begin
|
||||
withenv authenv do
|
||||
|
|
|
|||
103
manifests/api.pp
103
manifests/api.pp
|
|
@ -10,26 +10,6 @@
|
|||
# (optional) Whether the service should be managed by Puppet.
|
||||
# Defaults to true.
|
||||
#
|
||||
# [*keystone_user*]
|
||||
# (optional) The name of the auth user
|
||||
# Defaults to gnocchi
|
||||
#
|
||||
# [*keystone_tenant*]
|
||||
# (optional) Tenant to authenticate with.
|
||||
# Defaults to 'services'.
|
||||
#
|
||||
# [*keystone_password*]
|
||||
# Password to authenticate with.
|
||||
# Mandatory.
|
||||
#
|
||||
# [*keystone_auth_uri*]
|
||||
# (optional) Public Identity API endpoint.
|
||||
# Defaults to 'false'.
|
||||
#
|
||||
# [*keystone_identity_uri*]
|
||||
# (optional) Complete admin Identity API endpoint.
|
||||
# Defaults to: false
|
||||
#
|
||||
# [*host*]
|
||||
# (optional) The gnocchi api bind address.
|
||||
# Defaults to 0.0.0.0
|
||||
|
|
@ -63,27 +43,75 @@
|
|||
# [*sync_db*]
|
||||
# (optional) Run gnocchi-upgrade db sync on api nodes after installing the package.
|
||||
# Defaults to false
|
||||
|
||||
#
|
||||
# [*auth_strategy*]
|
||||
# (optional) Configure gnocchi authentication.
|
||||
# Can be set to noauth and keystone.
|
||||
# Defaults to 'keystone'.
|
||||
#
|
||||
# = DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*keystone_user*]
|
||||
# (optional) DEPRECATED. Use gnocchi::keystone::authtoken::username instead.
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*keystone_tenant*]
|
||||
# (optional) DEPRECATED. Use gnocchi::keystone::authtoken::project_name
|
||||
# instead.
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*keystone_password*]
|
||||
# (optional) DEPRECATED. Use gnocchi::keystone::authtoken::password instead.
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*keystone_auth_uri*]
|
||||
# (optional) DEPRECATED. Use gnocchi::keystone::authtoken::auth_uri instead.
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*keystone_identity_uri*]
|
||||
# (optional) DEPRECATED. Use gnocchi::keystone::authtoken::auth_url instead.
|
||||
# Defaults to undef
|
||||
#
|
||||
class gnocchi::api (
|
||||
$manage_service = true,
|
||||
$enabled = true,
|
||||
$package_ensure = 'present',
|
||||
$keystone_user = 'gnocchi',
|
||||
$keystone_tenant = 'services',
|
||||
$keystone_password = false,
|
||||
$keystone_auth_uri = false,
|
||||
$keystone_identity_uri = false,
|
||||
$host = '0.0.0.0',
|
||||
$port = '8041',
|
||||
$workers = $::processorcount,
|
||||
$max_limit = 1000,
|
||||
$service_name = $::gnocchi::params::api_service_name,
|
||||
$sync_db = false,
|
||||
$auth_strategy = 'keystone',
|
||||
# DEPRECATED PARAMETERS
|
||||
$keystone_user = undef,
|
||||
$keystone_tenant = undef,
|
||||
$keystone_password = undef,
|
||||
$keystone_auth_uri = undef,
|
||||
$keystone_identity_uri = undef,
|
||||
) inherits gnocchi::params {
|
||||
|
||||
include ::gnocchi::policy
|
||||
|
||||
validate_string($keystone_password)
|
||||
if $keystone_identity_uri {
|
||||
warning('gnocchi:api::keystone_identity_uri is deprecated, use gnocchi::keystone::authtoken::auth_url instead')
|
||||
}
|
||||
|
||||
if $keystone_auth_uri {
|
||||
warning('gnocchi::api::keystone_auth_uri is deprecated, use gnocchi::keystone::authtoken::auth_uri instead')
|
||||
}
|
||||
|
||||
if $keystone_user {
|
||||
warning('gnocchi::api::keystone_user is deprecated, use gnocchi::keystone::authtoken::username instead')
|
||||
}
|
||||
|
||||
if $keystone_tenant {
|
||||
warning('gnocchi::api::keystone_tenant is deprecated, use gnocchi::keystone::authtoken::project_name instead')
|
||||
}
|
||||
|
||||
if $keystone_password {
|
||||
warning('gnocchi::api::keystone_password is deprecated, use gnocchi::keystone::authtoken::password instead')
|
||||
}
|
||||
|
||||
Gnocchi_config<||> ~> Service[$service_name]
|
||||
Gnocchi_api_paste_ini<||> ~> Service[$service_name]
|
||||
|
|
@ -138,27 +166,18 @@ class gnocchi::api (
|
|||
}
|
||||
|
||||
gnocchi_config {
|
||||
'keystone_authtoken/auth_uri' : value => $keystone_auth_uri;
|
||||
'keystone_authtoken/admin_tenant_name' : value => $keystone_tenant;
|
||||
'keystone_authtoken/admin_user' : value => $keystone_user;
|
||||
'keystone_authtoken/admin_password' : value => $keystone_password, secret => true;
|
||||
'api/host' : value => $host;
|
||||
'api/port' : value => $port;
|
||||
'api/workers' : value => $workers;
|
||||
'api/max_limit' : value => $max_limit;
|
||||
'api/host': value => $host;
|
||||
'api/port': value => $port;
|
||||
'api/workers': value => $workers;
|
||||
'api/max_limit': value => $max_limit;
|
||||
}
|
||||
|
||||
if $keystone_identity_uri {
|
||||
gnocchi_config {
|
||||
'keystone_authtoken/identity_uri': value => $keystone_identity_uri;
|
||||
}
|
||||
if $auth_strategy == 'keystone' {
|
||||
include ::gnocchi::keystone::authtoken
|
||||
gnocchi_api_paste_ini {
|
||||
'pipeline:main/pipeline': value => 'gnocchi+auth',
|
||||
}
|
||||
} else {
|
||||
gnocchi_config {
|
||||
'keystone_authtoken/identity_uri': ensure => absent;
|
||||
}
|
||||
gnocchi_api_paste_ini {
|
||||
'pipeline:main/pipeline': value => 'gnocchi+noauth',
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,273 @@
|
|||
# class: gnocchi::keystone::authtoken
|
||||
#
|
||||
# Configure the keystone_authtoken section in the configuration file
|
||||
#
|
||||
# === Parameters
|
||||
#
|
||||
# [*username*]
|
||||
# (Optional) The name of the service user
|
||||
# Defaults to 'gnocchi'
|
||||
#
|
||||
# [*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 gnocchi::keystone::authtoken(
|
||||
$username = 'gnocchi',
|
||||
$password = $::os_service_default,
|
||||
$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 ! $::gnocchi::api::keystone_password {
|
||||
fail('Please set password for Gnocchi service user')
|
||||
}
|
||||
|
||||
$username_real = pick($::gnocchi::api::keystone_user,$username)
|
||||
$password_real = pick($::gnocchi::api::keystone_password,$password)
|
||||
$project_name_real = pick($::gnocchi::api::keystone_tenant,$project_name)
|
||||
$auth_uri_real = pick($::gnocchi::api::keystone_auth_uri, $auth_uri)
|
||||
$auth_url_real = pick($::gnocchi::api::keystone_identity_uri, $auth_url)
|
||||
|
||||
keystone::resource::authtoken { 'gnocchi_config':
|
||||
username => $username_real,
|
||||
password => $password_real,
|
||||
project_name => $project_name_real,
|
||||
auth_url => $auth_url_real,
|
||||
auth_uri => $auth_uri_real,
|
||||
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,
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
---
|
||||
features:
|
||||
- Configure keystonemiddleware in a consistent way with all options required
|
||||
for Keystone v3.
|
||||
deprecations:
|
||||
- gnocchi::api::keystone_user is deprecated in favor of
|
||||
gnocchi::keystone::authtoken::username.
|
||||
- gnocchi::api::keystone_password is deprecated in favor of
|
||||
gnocchi::keystone::authtoken::password.
|
||||
- gnocchi::api::keystone_tenant is deprecated in favor of
|
||||
gnocchi::keystone::authtoken::project_name
|
||||
- gnocchi::api::keystone_identity_uri is deprecated in favor of
|
||||
gnocchi::keystone::authtoken::auth_url.
|
||||
- gnocchi::api::keystone_auth_uri is deprecated in favor of
|
||||
gnocchi::keystone::authtoken::auth_uri
|
||||
|
|
@ -26,11 +26,12 @@ describe 'basic gnocchi' do
|
|||
debug => true,
|
||||
database_connection => 'mysql+pymysql://gnocchi:a_big_secret@127.0.0.1/gnocchi?charset=utf8',
|
||||
}
|
||||
class { '::gnocchi::keystone::authtoken':
|
||||
password => 'a_big_secret',
|
||||
}
|
||||
class { '::gnocchi::api':
|
||||
enabled => true,
|
||||
keystone_password => 'a_big_secret',
|
||||
keystone_identity_uri => 'http://127.0.0.1:35357/',
|
||||
service_name => 'httpd',
|
||||
enabled => true,
|
||||
service_name => 'httpd',
|
||||
}
|
||||
class { '::gnocchi::metricd': }
|
||||
class { '::gnocchi::db::sync': }
|
||||
|
|
|
|||
|
|
@ -11,8 +11,6 @@ describe 'gnocchi::api' do
|
|||
{ :enabled => true,
|
||||
:manage_service => true,
|
||||
:keystone_password => 'gnocchi-passw0rd',
|
||||
:keystone_tenant => 'services',
|
||||
:keystone_user => 'gnocchi',
|
||||
:package_ensure => 'latest',
|
||||
:port => '8041',
|
||||
:max_limit => '1000',
|
||||
|
|
@ -22,11 +20,6 @@ describe 'gnocchi::api' do
|
|||
|
||||
shared_examples_for 'gnocchi-api' do
|
||||
|
||||
context 'without required parameter keystone_password' do
|
||||
before { params.delete(:keystone_password) }
|
||||
it { expect { is_expected.to raise_error(Puppet::Error) } }
|
||||
end
|
||||
|
||||
it { is_expected.to contain_class('gnocchi::params') }
|
||||
it { is_expected.to contain_class('gnocchi::policy') }
|
||||
|
||||
|
|
@ -39,10 +32,6 @@ describe 'gnocchi::api' do
|
|||
end
|
||||
|
||||
it 'configures keystone authentication middleware' do
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/admin_tenant_name').with_value( params[:keystone_tenant] )
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/admin_user').with_value( params[:keystone_user] )
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/admin_password').with_value( params[:keystone_password] )
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/admin_password').with_value( params[:keystone_password] ).with_secret(true)
|
||||
is_expected.to contain_gnocchi_config('api/host').with_value( params[:host] )
|
||||
is_expected.to contain_gnocchi_config('api/port').with_value( params[:port] )
|
||||
is_expected.to contain_gnocchi_config('api/max_limit').with_value( params[:max_limit] )
|
||||
|
|
@ -131,55 +120,27 @@ describe 'gnocchi::api' do
|
|||
it_raises 'a Puppet::Error', /Invalid service_name/
|
||||
end
|
||||
|
||||
context 'with custom auth_uri' do
|
||||
context "with noauth" do
|
||||
before do
|
||||
params.merge!({
|
||||
:keystone_auth_uri => 'https://foo.bar:1234/',
|
||||
:auth_strategy => 'noauth',
|
||||
})
|
||||
end
|
||||
it 'should configure custom auth_uri correctly' do
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/auth_uri').with_value( 'https://foo.bar:1234/' )
|
||||
end
|
||||
end
|
||||
|
||||
context "with no keystone identity_uri" do
|
||||
before do
|
||||
params.merge!({
|
||||
:keystone_identity_uri => false,
|
||||
})
|
||||
end
|
||||
it 'configures identity_uri' do
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/identity_uri').with_value(nil);
|
||||
it 'configures pipeline' do
|
||||
is_expected.to contain_gnocchi_api_paste_ini('pipeline:main/pipeline').with_value('gnocchi+noauth');
|
||||
end
|
||||
end
|
||||
|
||||
context "with custom keystone identity_uri" do
|
||||
context "with keystone" do
|
||||
before do
|
||||
params.merge!({
|
||||
:keystone_identity_uri => 'https://foo.bar:1234/',
|
||||
:auth_strategy => 'keystone',
|
||||
})
|
||||
end
|
||||
it 'configures identity_uri' do
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/identity_uri').with_value("https://foo.bar:1234/");
|
||||
it 'configures pipeline' do
|
||||
is_expected.to contain_gnocchi_api_paste_ini('pipeline:main/pipeline').with_value('gnocchi+auth');
|
||||
end
|
||||
end
|
||||
|
||||
context "with custom keystone identity_uri and auth_uri" do
|
||||
before do
|
||||
params.merge!({
|
||||
:keystone_identity_uri => 'https://foo.bar:35357/',
|
||||
:keystone_auth_uri => 'https://foo.bar:5000/v2.0/',
|
||||
})
|
||||
end
|
||||
it 'configures identity_uri and auth_uri but deprecates old auth settings' do
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/identity_uri').with_value("https://foo.bar:35357/");
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/auth_uri').with_value("https://foo.bar:5000/v2.0/");
|
||||
is_expected.to contain_gnocchi_api_paste_ini('pipeline:main/pipeline').with_value('gnocchi+auth');
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
on_supported_os({
|
||||
|
|
|
|||
|
|
@ -0,0 +1,145 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe 'gnocchi::keystone::authtoken' do
|
||||
|
||||
let :params do
|
||||
{ :password => 'gnocchi_password', }
|
||||
end
|
||||
|
||||
shared_examples 'gnocchi authtoken' do
|
||||
|
||||
context 'with default parameters' do
|
||||
|
||||
it 'configure keystone_authtoken' do
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/username').with_value('gnocchi')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/password').with_value('gnocchi_password')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/auth_url').with_value('http://localhost:35357')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/project_name').with_value('services')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/user_domain_name').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/project_domain_name').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/insecure').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/auth_section').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/auth_type').with_value('password')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/auth_uri').with_value('http://localhost:5000')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/auth_version').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/cache').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/cafile').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/certfile').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/check_revocations_for_cached').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/delay_auth_decision').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/enforce_token_bind').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/hash_algorithms').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/http_connect_timeout').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/http_request_max_retries').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/include_service_catalog').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/keyfile').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/memcache_pool_conn_get_timeout').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/memcache_pool_dead_retry').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/memcache_pool_maxsize').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/memcache_pool_socket_timeout').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/memcache_pool_unused_timeout').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/memcache_secret_key').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/memcache_security_strategy').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/memcache_use_advanced_pool').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/memcached_servers').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/region_name').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/revocation_cache_time').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/signing_dir').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_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_gnocchi_config('keystone_authtoken/auth_uri').with_value('https://10.0.0.1:9999/')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/username').with_value(params[:username])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/password').with_value(params[:password]).with_secret(true)
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/auth_url').with_value(params[:auth_url])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/project_name').with_value(params[:project_name])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/user_domain_name').with_value(params[:user_domain_name])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/project_domain_name').with_value(params[:project_domain_name])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/insecure').with_value(params[:insecure])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/auth_section').with_value(params[:auth_section])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/auth_type').with_value(params[:auth_type])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/auth_version').with_value(params[:auth_version])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/cache').with_value(params[:cache])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/cafile').with_value(params[:cafile])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/certfile').with_value(params[:certfile])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/check_revocations_for_cached').with_value(params[:check_revocations_for_cached])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/delay_auth_decision').with_value(params[:delay_auth_decision])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/enforce_token_bind').with_value(params[:enforce_token_bind])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/hash_algorithms').with_value(params[:hash_algorithms])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/http_connect_timeout').with_value(params[:http_connect_timeout])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/http_request_max_retries').with_value(params[:http_request_max_retries])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/include_service_catalog').with_value(params[:include_service_catalog])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/keyfile').with_value(params[:keyfile])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/memcache_pool_conn_get_timeout').with_value(params[:memcache_pool_conn_get_timeout])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/memcache_pool_dead_retry').with_value(params[:memcache_pool_dead_retry])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/memcache_pool_maxsize').with_value(params[:memcache_pool_maxsize])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/memcache_pool_socket_timeout').with_value(params[:memcache_pool_socket_timeout])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/memcache_pool_unused_timeout').with_value(params[:memcache_pool_unused_timeout])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/memcache_secret_key').with_value(params[:memcache_secret_key])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/memcache_security_strategy').with_value(params[:memcache_security_strategy])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/memcache_use_advanced_pool').with_value(params[:memcache_use_advanced_pool])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211')
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/region_name').with_value(params[:region_name])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/revocation_cache_time').with_value(params[:revocation_cache_time])
|
||||
is_expected.to contain_gnocchi_config('keystone_authtoken/signing_dir').with_value(params[:signing_dir])
|
||||
is_expected.to contain_gnocchi_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 'gnocchi authtoken'
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
Loading…
Reference in New Issue