diff --git a/examples/basic.pp b/examples/basic.pp index 9d99cbdf..cca219dd 100644 --- a/examples/basic.pp +++ b/examples/basic.pp @@ -24,16 +24,16 @@ class { '::sahara::db::mysql': class { '::sahara': database_connection => 'mysql+pymysql://sahara:a_big_secret@127.0.0.1:3306/sahara', debug => true, - admin_user => 'admin', - admin_password => 'secrets_everywhere', - admin_tenant_name => 'admin', - auth_uri => 'http://127.0.0.1:5000/v2.0/', - identity_uri => 'http://127.0.0.1:35357/', host => '0.0.0.0', port => 8386, use_floating_ips => true, } +# Keystone authtoken parameters +class { '::sahara::keystone::authtoken': + password => 'a_big_secret', +} + # Please note, that if you enabled 'all' service, then you should not enable 'api' and 'engine'. And vice versa. class { '::sahara::service::all': } diff --git a/manifests/init.pp b/manifests/init.pp index b778a8dc..605f1846 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -101,34 +101,6 @@ # (Optional) Enable dbsync # Defaults to true. # -# == keystone authentication options -# -# [*admin_user*] -# (Optional) Service user name -# Defaults to 'sahara'. -# -# [*admin_password*] -# (Optional) Service user password. -# Defaults to false. -# -# [*admin_tenant_name*] -# (Optional) Service tenant name. -# Defaults to 'services'. -# -# [*auth_uri*] -# (Optional) Complete public Identity API endpoint. -# Defaults to 'http://127.0.0.1:5000/v2.0/'. -# -# [*identity_uri*] -# (Optional) Complete admin Identity API endpoint. -# This should specify the unversioned root endpoint. -# Defaults to 'http://127.0.0.1:35357/'. -# -# [*memcached_servers*] -# (optinal) 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. -# # == rpc backend options # # [*default_transport_url*] @@ -339,6 +311,32 @@ # (Optional) Virtual host to use. # Defaults to $::os_service_default. # +# [*admin_user*] +# (Optional) Service user name +# Defaults to undef. +# +# [*admin_password*] +# (Optional) Service user password. +# Defaults to undef. +# +# [*admin_tenant_name*] +# (Optional) Service tenant name. +# Defaults to undef. +# +# [*auth_uri*] +# (Optional) Complete public Identity API endpoint. +# Defaults to undef. +# +# [*identity_uri*] +# (Optional) Complete admin Identity API endpoint. +# This should specify the unversioned root endpoint. +# Defaults to undef. +# +# [*memcached_servers*] +# (optinal) a list of memcached server(s) to use for caching. If left +# undefined, tokens will instead be cached in-process. +# Defaults to undef. +# class sahara( $package_ensure = 'present', $debug = undef, @@ -363,12 +361,6 @@ class sahara( $database_retry_interval = undef, $database_max_overflow = undef, $sync_db = true, - $admin_user = 'sahara', - $admin_password = false, - $admin_tenant_name = 'services', - $auth_uri = 'http://127.0.0.1:5000/v2.0/', - $identity_uri = 'http://127.0.0.1:35357/', - $memcached_servers = $::os_service_default, $default_transport_url = $::os_service_default, $rpc_response_timeout = $::os_service_default, $control_exchange = $::os_service_default, @@ -418,6 +410,12 @@ class sahara( $rabbit_userid = $::os_service_default, $rabbit_password = $::os_service_default, $rabbit_virtual_host = $::os_service_default, + $admin_user = undef, + $admin_password = undef, + $admin_tenant_name = undef, + $auth_uri = undef, + $identity_uri = undef, + $memcached_servers = undef, ) { include ::sahara::deps @@ -437,6 +435,18 @@ sahara::rabbit_port, sahara::rabbit_userid and sahara::rabbit_virtual_host are \ deprecated. Please use sahara::default_transport_url instead.") } + if $admin_user or $admin_password or + $admin_tenant_name or $auth_uri or + $identity_uri or $memcached_servers { + warning("sahara::admin_user, sahara::admin_password, sahara::auth_uri, \ +sahara::identity_uri, sahara::admin_tenant_name and sahara::memcached_servers are \ +deprecated. Please use sahara::keystone::authtoken::* parameters instead.") + } + + if $admin_password { + include ::sahara::keystone::authtoken + } + package { 'sahara-common': ensure => $package_ensure, name => $::sahara::params::common_package_name, @@ -456,19 +466,6 @@ deprecated. Please use sahara::default_transport_url instead.") 'DEFAULT/default_ntp_server': value => $default_ntp_server; } - if $admin_password { - sahara_config { - 'keystone_authtoken/auth_uri': value => $auth_uri; - 'keystone_authtoken/identity_uri': value => $identity_uri; - 'keystone_authtoken/admin_user': value => $admin_user; - 'keystone_authtoken/admin_tenant_name': value => $admin_tenant_name; - 'keystone_authtoken/admin_password': - value => $admin_password, - secret => true; - 'keystone_authtoken/memcached_servers': value => join(any2array($memcached_servers), ','); - } - } - oslo::messaging::default { 'sahara_config': transport_url => $default_transport_url, rpc_response_timeout => $rpc_response_timeout, diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp new file mode 100644 index 00000000..4aa0c8de --- /dev/null +++ b/manifests/keystone/authtoken.pp @@ -0,0 +1,277 @@ +# class: sahara::keystone::authtoken +# +# Configure the keystone_authtoken section in the configuration file +# +# === Parameters +# +# [*username*] +# (Optional) The name of the service user +# Defaults to 'sahara' +# +# [*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:://127.0.0.1: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 $::os_service_default +# +# [*auth_uri*] +# (Optional) Complete public Identity API endpoint. +# Defaults to 'http://127.0.0.1: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. +# +# [*manage_memcache_package*] +# (Optional) Whether to install the python-memcache package. +# Defaults to false. +# +# [*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. +# +# [*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. +# +# DEPRECATED PARAMETERS +# +# [*signing_dir*] +# (Optional) Directory used to cache files related to PKI tokens. +# Defaults to undef +# +class sahara::keystone::authtoken( + $username = 'sahara', + $password = $::os_service_default, + $auth_url = 'http://127.0.0.1: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://127.0.0.1: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, + $manage_memcache_package = false, + $region_name = $::os_service_default, + $revocation_cache_time = $::os_service_default, + $token_cache_time = $::os_service_default, +) { + +#NOTE(emilien): Use pick to keep backward compatibility +$username_real = pick($::sahara::admin_user,$username) +$password_real = pick($::sahara::admin_password,$password) +$project_name_real = pick($::sahara::admin_tenant_name,$project_name) +$memcached_servers_real = pick($::sahara::memcached_servers,$memcached_servers) +$auth_uri_real = pick($::sahara::auth_uri,$auth_uri) +$auth_url_real = pick($::sahara::identity_uri,$auth_url) + + keystone::resource::authtoken { 'sahara_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_real, + manage_memcache_package => $manage_memcache_package, + region_name => $region_name, + revocation_cache_time => $revocation_cache_time, + token_cache_time => $token_cache_time, + } +} diff --git a/releasenotes/notes/authtoken-c3466f4f6028a182.yaml b/releasenotes/notes/authtoken-c3466f4f6028a182.yaml new file mode 100644 index 00000000..cb100abe --- /dev/null +++ b/releasenotes/notes/authtoken-c3466f4f6028a182.yaml @@ -0,0 +1,9 @@ +--- +features: + - Allow to configure authtoken parameters, useful when running Keystone + v3 API. This class is sahara::keystone::authtoken and parameters are + consistent with other modules. +deprecations: + - sahara::admin_user, sahara::admin_password, sahara::auth_uri, + sahara::identity_uri, sahara::admin_tenant_name and sahara::memcached_servers + are deprecated. Please use sahara::keystone::authtoken::* parameters instead. diff --git a/spec/acceptance/basic_sahara_spec.rb b/spec/acceptance/basic_sahara_spec.rb index 9b4b4efb..ec0f76b4 100644 --- a/spec/acceptance/basic_sahara_spec.rb +++ b/spec/acceptance/basic_sahara_spec.rb @@ -35,7 +35,9 @@ describe 'basic sahara' do default_transport_url => 'rabbit://sahara:an_even_bigger_secret@127.0.0.1:5672/', rpc_backend => 'rabbit', database_connection => 'mysql+pymysql://sahara:a_big_secret@127.0.0.1/sahara?charset=utf8', - admin_password => 'a_big_secret', + } + class { '::sahara::keystone::authtoken': + password => 'a_big_secret', } class { '::sahara::service::api': } class { '::sahara::service::engine': } diff --git a/spec/classes/sahara_init_spec.rb b/spec/classes/sahara_init_spec.rb index e997cf5b..f7823187 100644 --- a/spec/classes/sahara_init_spec.rb +++ b/spec/classes/sahara_init_spec.rb @@ -34,12 +34,7 @@ describe 'sahara' do it { is_expected.to contain_sahara_config('DEFAULT/use_floating_ips').with_value('') } it { is_expected.to contain_sahara_config('DEFAULT/host').with_value('') } it { is_expected.to contain_sahara_config('DEFAULT/port').with_value('') } - it { is_expected.to contain_sahara_config('keystone_authtoken/auth_uri').with_value('http://127.0.0.1:5000/v2.0/') } - it { is_expected.to contain_sahara_config('keystone_authtoken/identity_uri').with_value('http://127.0.0.1:35357/') } - it { is_expected.to contain_sahara_config('keystone_authtoken/admin_user').with_value('sahara') } - it { is_expected.to contain_sahara_config('keystone_authtoken/admin_tenant_name').with_value('services') } - it { is_expected.to contain_sahara_config('keystone_authtoken/admin_password').with_value('secrete').with_secret(true) } - it { is_expected.to contain_sahara_config('keystone_authtoken/memcached_servers').with_value('') } + it { is_expected.to contain_sahara_config('keystone_authtoken/auth_uri').with_value('http://127.0.0.1:5000/') } it { is_expected.to contain_sahara_config('DEFAULT/plugins').with_value('') } it { is_expected.to contain_sahara_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value('') } it { is_expected.to contain_sahara_config('oslo_messaging_rabbit/kombu_compression').with_value('') } @@ -55,12 +50,6 @@ describe 'sahara' do :use_neutron => 'true', :host => 'localhost', :port => '8387', - :auth_uri => 'http://8.8.8.8:5000/v2.0/', - :identity_uri => 'http://8.8.8.8:35357/', - :admin_user => 'sahara-user', - :admin_tenant_name => 'sahara-tenant', - :admin_password => 'new_password', - :memcached_servers => '1.1.1.1:11211', :plugins => ['plugin1', 'plugin2'], :default_transport_url => 'rabbit://guest2:pass@localhost2:5673', :rpc_response_timeout => '120', @@ -71,13 +60,6 @@ describe 'sahara' do it { is_expected.to contain_sahara_config('DEFAULT/use_neutron').with_value('true') } it { is_expected.to contain_sahara_config('DEFAULT/host').with_value('localhost') } - it { is_expected.to contain_sahara_config('DEFAULT/port').with_value('8387') } - it { is_expected.to contain_sahara_config('keystone_authtoken/auth_uri').with_value('http://8.8.8.8:5000/v2.0/') } - it { is_expected.to contain_sahara_config('keystone_authtoken/identity_uri').with_value('http://8.8.8.8:35357/') } - it { is_expected.to contain_sahara_config('keystone_authtoken/admin_user').with_value('sahara-user') } - it { is_expected.to contain_sahara_config('keystone_authtoken/admin_tenant_name').with_value('sahara-tenant') } - it { is_expected.to contain_sahara_config('keystone_authtoken/admin_password').with_value('new_password').with_secret(true) } - it { is_expected.to contain_sahara_config('keystone_authtoken/memcached_servers').with_value('1.1.1.1:11211') } it { is_expected.to contain_sahara_config('DEFAULT/plugins').with_value('plugin1,plugin2') } it { is_expected.to contain_sahara_config('DEFAULT/transport_url').with_value('rabbit://guest2:pass@localhost2:5673') } it { is_expected.to contain_sahara_config('DEFAULT/rpc_response_timeout').with_value('120') } diff --git a/spec/classes/sahara_keystone_authtoken_spec.rb b/spec/classes/sahara_keystone_authtoken_spec.rb new file mode 100644 index 00000000..15e10f89 --- /dev/null +++ b/spec/classes/sahara_keystone_authtoken_spec.rb @@ -0,0 +1,149 @@ +require 'spec_helper' + +describe 'sahara::keystone::authtoken' do + + let :params do + { :password => 'sahara_password', } + end + + shared_examples 'sahara authtoken' do + + context 'with default parameters' do + + it 'configure keystone_authtoken' do + is_expected.to contain_sahara_config('keystone_authtoken/username').with_value('sahara') + is_expected.to contain_sahara_config('keystone_authtoken/password').with_value('sahara_password') + is_expected.to contain_sahara_config('keystone_authtoken/auth_url').with_value('http://127.0.0.1:35357/') + is_expected.to contain_sahara_config('keystone_authtoken/project_name').with_value('services') + is_expected.to contain_sahara_config('keystone_authtoken/user_domain_name').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/project_domain_name').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/insecure').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/auth_section').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/auth_type').with_value('password') + is_expected.to contain_sahara_config('keystone_authtoken/auth_uri').with_value('http://127.0.0.1:5000/') + is_expected.to contain_sahara_config('keystone_authtoken/auth_version').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/cache').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/cafile').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/certfile').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/check_revocations_for_cached').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/delay_auth_decision').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/enforce_token_bind').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/hash_algorithms').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/http_connect_timeout').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/http_request_max_retries').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/include_service_catalog').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/keyfile').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/memcache_pool_conn_get_timeout').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/memcache_pool_dead_retry').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/memcache_pool_maxsize').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/memcache_pool_socket_timeout').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/memcache_pool_unused_timeout').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/memcache_secret_key').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/memcache_security_strategy').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/memcache_use_advanced_pool').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/memcached_servers').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/region_name').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/revocation_cache_time').with_value('') + is_expected.to contain_sahara_config('keystone_authtoken/token_cache_time').with_value('') + 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'], + :manage_memcache_package => true, + :region_name => 'region2', + :revocation_cache_time => '11', + :token_cache_time => '301', + }) + end + + it 'configure keystone_authtoken' do + is_expected.to contain_sahara_config('keystone_authtoken/auth_uri').with_value('https://10.0.0.1:9999/') + is_expected.to contain_sahara_config('keystone_authtoken/username').with_value(params[:username]) + is_expected.to contain_sahara_config('keystone_authtoken/password').with_value(params[:password]).with_secret(true) + is_expected.to contain_sahara_config('keystone_authtoken/auth_url').with_value(params[:auth_url]) + is_expected.to contain_sahara_config('keystone_authtoken/project_name').with_value(params[:project_name]) + is_expected.to contain_sahara_config('keystone_authtoken/user_domain_name').with_value(params[:user_domain_name]) + is_expected.to contain_sahara_config('keystone_authtoken/project_domain_name').with_value(params[:project_domain_name]) + is_expected.to contain_sahara_config('keystone_authtoken/insecure').with_value(params[:insecure]) + is_expected.to contain_sahara_config('keystone_authtoken/auth_section').with_value(params[:auth_section]) + is_expected.to contain_sahara_config('keystone_authtoken/auth_type').with_value(params[:auth_type]) + is_expected.to contain_sahara_config('keystone_authtoken/auth_version').with_value(params[:auth_version]) + is_expected.to contain_sahara_config('keystone_authtoken/cache').with_value(params[:cache]) + is_expected.to contain_sahara_config('keystone_authtoken/cafile').with_value(params[:cafile]) + is_expected.to contain_sahara_config('keystone_authtoken/certfile').with_value(params[:certfile]) + is_expected.to contain_sahara_config('keystone_authtoken/check_revocations_for_cached').with_value(params[:check_revocations_for_cached]) + is_expected.to contain_sahara_config('keystone_authtoken/delay_auth_decision').with_value(params[:delay_auth_decision]) + is_expected.to contain_sahara_config('keystone_authtoken/enforce_token_bind').with_value(params[:enforce_token_bind]) + is_expected.to contain_sahara_config('keystone_authtoken/hash_algorithms').with_value(params[:hash_algorithms]) + is_expected.to contain_sahara_config('keystone_authtoken/http_connect_timeout').with_value(params[:http_connect_timeout]) + is_expected.to contain_sahara_config('keystone_authtoken/http_request_max_retries').with_value(params[:http_request_max_retries]) + is_expected.to contain_sahara_config('keystone_authtoken/include_service_catalog').with_value(params[:include_service_catalog]) + is_expected.to contain_sahara_config('keystone_authtoken/keyfile').with_value(params[:keyfile]) + is_expected.to contain_sahara_config('keystone_authtoken/memcache_pool_conn_get_timeout').with_value(params[:memcache_pool_conn_get_timeout]) + is_expected.to contain_sahara_config('keystone_authtoken/memcache_pool_dead_retry').with_value(params[:memcache_pool_dead_retry]) + is_expected.to contain_sahara_config('keystone_authtoken/memcache_pool_maxsize').with_value(params[:memcache_pool_maxsize]) + is_expected.to contain_sahara_config('keystone_authtoken/memcache_pool_socket_timeout').with_value(params[:memcache_pool_socket_timeout]) + is_expected.to contain_sahara_config('keystone_authtoken/memcache_pool_unused_timeout').with_value(params[:memcache_pool_unused_timeout]) + is_expected.to contain_sahara_config('keystone_authtoken/memcache_secret_key').with_value(params[:memcache_secret_key]) + is_expected.to contain_sahara_config('keystone_authtoken/memcache_security_strategy').with_value(params[:memcache_security_strategy]) + is_expected.to contain_sahara_config('keystone_authtoken/memcache_use_advanced_pool').with_value(params[:memcache_use_advanced_pool]) + is_expected.to contain_sahara_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211') + is_expected.to contain_sahara_config('keystone_authtoken/region_name').with_value(params[:region_name]) + is_expected.to contain_sahara_config('keystone_authtoken/revocation_cache_time').with_value(params[:revocation_cache_time]) + is_expected.to contain_sahara_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) + end + + it 'installs python memcache package' do + is_expected.to contain_package('python-memcache') + 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 'sahara authtoken' + end + end + +end