Allow python-memcache install from authtoken class
The python-memcache package is required if using memcached. By default the package is not installed and the define has it set to false. This change allows managing the python-memcache package install from the authtoken class. Added a .gitignore since it was missing. Change-Id: I545f25a0644d5b490de76b759c97651691e3f743
This commit is contained in:
15
.gitignore
vendored
Normal file
15
.gitignore
vendored
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
pkg/
|
||||||
|
Gemfile.lock
|
||||||
|
vendor/
|
||||||
|
spec/fixtures/
|
||||||
|
.vagrant/
|
||||||
|
.bundle/
|
||||||
|
coverage/
|
||||||
|
.idea/
|
||||||
|
*.swp
|
||||||
|
*.iml
|
||||||
|
openstack/
|
||||||
|
|
||||||
|
# Files created by releasenotes build
|
||||||
|
releasenotes/build
|
||||||
|
.tox
|
||||||
@@ -163,6 +163,10 @@
|
|||||||
# caching. If left undefined, tokens will instead be cached in-process.
|
# caching. If left undefined, tokens will instead be cached in-process.
|
||||||
# Defaults to $::os_service_default.
|
# Defaults to $::os_service_default.
|
||||||
#
|
#
|
||||||
|
# [*manage_memcache_package*]
|
||||||
|
# (Optional) Whether to install the python-memcache package.
|
||||||
|
# Defaults to false.
|
||||||
|
#
|
||||||
# [*region_name*]
|
# [*region_name*]
|
||||||
# (Optional) The region in which the identity server can be found.
|
# (Optional) The region in which the identity server can be found.
|
||||||
# Defaults to $::os_service_default.
|
# Defaults to $::os_service_default.
|
||||||
@@ -212,6 +216,7 @@ class cloudkitty::keystone::authtoken(
|
|||||||
$memcache_security_strategy = $::os_service_default,
|
$memcache_security_strategy = $::os_service_default,
|
||||||
$memcache_use_advanced_pool = $::os_service_default,
|
$memcache_use_advanced_pool = $::os_service_default,
|
||||||
$memcached_servers = $::os_service_default,
|
$memcached_servers = $::os_service_default,
|
||||||
|
$manage_memcache_package = false,
|
||||||
$region_name = $::os_service_default,
|
$region_name = $::os_service_default,
|
||||||
$revocation_cache_time = $::os_service_default,
|
$revocation_cache_time = $::os_service_default,
|
||||||
$token_cache_time = $::os_service_default,
|
$token_cache_time = $::os_service_default,
|
||||||
@@ -251,6 +256,7 @@ class cloudkitty::keystone::authtoken(
|
|||||||
memcache_use_advanced_pool => $memcache_use_advanced_pool,
|
memcache_use_advanced_pool => $memcache_use_advanced_pool,
|
||||||
memcache_pool_unused_timeout => $memcache_pool_unused_timeout,
|
memcache_pool_unused_timeout => $memcache_pool_unused_timeout,
|
||||||
memcached_servers => $memcached_servers,
|
memcached_servers => $memcached_servers,
|
||||||
|
manage_memcache_package => $manage_memcache_package,
|
||||||
region_name => $region_name,
|
region_name => $region_name,
|
||||||
revocation_cache_time => $revocation_cache_time,
|
revocation_cache_time => $revocation_cache_time,
|
||||||
token_cache_time => $token_cache_time,
|
token_cache_time => $token_cache_time,
|
||||||
|
|||||||
@@ -82,6 +82,7 @@ describe 'cloudkitty::keystone::authtoken' do
|
|||||||
:memcache_security_strategy => 'ENCRYPT',
|
:memcache_security_strategy => 'ENCRYPT',
|
||||||
:memcache_use_advanced_pool => true,
|
:memcache_use_advanced_pool => true,
|
||||||
:memcached_servers => ['memcached01:11211','memcached02:11211'],
|
:memcached_servers => ['memcached01:11211','memcached02:11211'],
|
||||||
|
:manage_memcache_package => true,
|
||||||
:region_name => 'region2',
|
:region_name => 'region2',
|
||||||
:revocation_cache_time => '11',
|
:revocation_cache_time => '11',
|
||||||
:token_cache_time => '301',
|
:token_cache_time => '301',
|
||||||
@@ -124,6 +125,10 @@ describe 'cloudkitty::keystone::authtoken' do
|
|||||||
is_expected.to contain_cloudkitty_config('keystone_authtoken/revocation_cache_time').with_value(params[:revocation_cache_time])
|
is_expected.to contain_cloudkitty_config('keystone_authtoken/revocation_cache_time').with_value(params[:revocation_cache_time])
|
||||||
is_expected.to contain_cloudkitty_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
|
is_expected.to contain_cloudkitty_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'installs python memcache package' do
|
||||||
|
is_expected.to contain_package('python-memcache')
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user