diff --git a/manifests/swift/proxy.pp b/manifests/swift/proxy.pp index 43a7825..fe973cb 100644 --- a/manifests/swift/proxy.pp +++ b/manifests/swift/proxy.pp @@ -20,7 +20,9 @@ class openstack::swift::proxy ( $package_ensure = 'present', $controller_node_address = '10.0.0.1', $keystone_host = '10.0.0.1', - $memcached = true + $memcached = true, + $swift_memcache_servers = ['127.0.0.1:11211'], + $memcached_listen_ip = '127.0.0.1' ) { if $controller_node_address !='10.0.0.1' { @@ -36,7 +38,7 @@ class openstack::swift::proxy ( if $memcached { class { 'memcached': - listen_ip => '127.0.0.1', + listen_ip => $memcached_listen_ip, } } @@ -55,10 +57,13 @@ class openstack::swift::proxy ( class { [ '::swift::proxy::catch_errors', '::swift::proxy::healthcheck', - '::swift::proxy::cache', '::swift::proxy::swift3', ]: } + class { 'swift::proxy::cache': + memcache_servers => $swift_memcache_servers, + } + class { '::swift::proxy::ratelimit': clock_accuracy => $ratelimit_clock_accuracy, max_sleep_time_seconds => $ratelimit_max_sleep_time_seconds,