stackforge/puppet-openstack-cloud
Code Issues Proposed changes

cache: Update with new param: memcache_servers

Browse Source 
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2014-01-02 13:46:39 +01:00
parent 7610b787ee
commit 6c65c87339
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/identity.pp
View File

@ -35,7 +35,7 @@
# (optional) Password to connect to keystone database # (optional) Password to connect to keystone database
# Default value in params # Default value in params
# #
# [*keystone_memcached*] # [*memcache_servers*]
# (optional) Memcached servers used by Keystone. Should be an array. # (optional) Memcached servers used by Keystone. Should be an array.
# Default value in params # Default value in params
# #
@ -257,8 +257,7 @@ class privatecloud::identity (
$keystone_db_host = $os_params::keystone_db_host, $keystone_db_host = $os_params::keystone_db_host,
$keystone_db_user = $os_params::keystone_db_user, $keystone_db_user = $os_params::keystone_db_user,
$keystone_db_password = $os_params::keystone_db_password, $keystone_db_password = $os_params::keystone_db_password,
#TODO(EmilienM) Drop this param and use a more general, like "memcached_severs" $memcache_servers = $os_params::memcache_servers,
$keystone_memcached = $os_params::keystone_memcached,
$ks_admin_email = $os_params::ks_admin_email, $ks_admin_email = $os_params::ks_admin_email,
$ks_admin_password = $os_params::ks_admin_password, $ks_admin_password = $os_params::ks_admin_password,
$ks_admin_tenant = $os_params::ks_admin_tenant, $ks_admin_tenant = $os_params::ks_admin_tenant,
@ -327,7 +326,7 @@ class privatecloud::identity (
debug => $debug, debug => $debug,
idle_timeout => 60, idle_timeout => 60,
log_facility => 'LOG_LOCAL0', log_facility => 'LOG_LOCAL0',
memcache_servers => $keystone_memcached, memcache_servers => $memcache_servers,
sql_connection => "mysql://${encoded_user}:${encoded_password}@${keystone_db_host}/keystone", sql_connection => "mysql://${encoded_user}:${encoded_password}@${keystone_db_host}/keystone",
token_driver => 'keystone.token.backends.memcache.Token', token_driver => 'keystone.token.backends.memcache.Token',
token_format => 'UUID', token_format => 'UUID',

20
manifests/object/controller.pp
View File

@ -17,16 +17,16 @@
# #
class privatecloud::object::controller( class privatecloud::object::controller(
$ks_keystone_admin_host = $os_params::ks_keystone_admin_host, $ks_keystone_admin_host = $os_params::ks_keystone_admin_host,
$ks_keystone_admin_port = $os_params::ks_keystone_admin_port, $ks_keystone_admin_port = $os_params::ks_keystone_admin_port,
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host, $ks_keystone_internal_host = $os_params::ks_keystone_internal_host,
$ks_keystone_internal_port = $os_params::ks_keystone_internal_port, $ks_keystone_internal_port = $os_params::ks_keystone_internal_port,
$ks_swift_dispersion_password = $os_params::ks_swift_dispersion_password, $ks_swift_dispersion_password = $os_params::ks_swift_dispersion_password,
$ks_swift_internal_port = $os_params::ks_swift_internal_port, $ks_swift_internal_port = $os_params::ks_swift_internal_port,
$ks_swift_password = $os_params::ks_swift_password, $ks_swift_password = $os_params::ks_swift_password,
$statsd_host = $os_params::statsd_host, $statsd_host = $os_params::statsd_host,
$statsd_port = $os_params::statsd_port, $statsd_port = $os_params::statsd_port,
$swift_memchached = $os_params::swift_memchached $memcache_servers = $os_params::memcache_servers
) { ) {
include 'privatecloud::object' include 'privatecloud::object'
@ -53,7 +53,7 @@ log_statsd_default_sample_rate = 1
class{'swift::proxy::cache': class{'swift::proxy::cache':
memcache_servers => inline_template( memcache_servers => inline_template(
'<%= scope.lookupvar("swift_memchached").join(",") %>'), '<%= scope.lookupvar("memcache_servers").join(",") %>'),
} }
class { 'swift::proxy::proxy-logging': } class { 'swift::proxy::proxy-logging': }
class { 'swift::proxy::healthcheck': } class { 'swift::proxy::healthcheck': }