openstack
/
fuel-library
Code Issues Proposed changes

Merge "Signing dir for swift"

This commit is contained in:
vic 2012-12-17 05:10:10 +04:00 committed by Gerrit Code Review
parent 6872a77474 d922f31907
commit 68199bc764
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deployment/puppet/keystone/manifests/client/authtoken.pp
View File

@ -41,7 +41,8 @@ define keystone::client::authtoken(
$delay_auth_decision = '0',
$auth_host = '127.0.0.1',
$auth_port = '35357',
$auth_protocol = 'http'
$auth_protocol = 'http',
$signing_dir = undef,
# TODO implement these eventually
# $memcache_servers
# $token_cache_time

3
deployment/puppet/keystone/templates/client/authtoken.conf.erb
View File

@ -17,3 +17,6 @@ admin_user = <%= admin_user %>
admin_password = <%= admin_password %>
<% end -%>
delay_auth_decision = <%= delay_auth_decision %>
<% if signing_dir -%>
signing_dir = <%= signing_dir %>
<% end -%>

3
deployment/puppet/swift/manifests/proxy/authtoken.pp
View File

@ -50,7 +50,8 @@ class swift::proxy::authtoken(
delay_auth_decision => $delay_auth_decision,
auth_host => $auth_host,
auth_port => $auth_port,
auth_protocol => $auth_protocol
auth_protocol => $auth_protocol,
signing_dir => '/tmp/keystone_signing_swift',
}
}