Browse code

Merge "Set up swift's auth cache dir"

Jenkins authored on 2012/12/29 08:49:59
Showing 1 changed files
... ...
@@ -29,6 +29,7 @@ set +o xtrace
29 29
 
30 30
 SWIFT_DIR=$DEST/swift
31 31
 SWIFTCLIENT_DIR=$DEST/python-swiftclient
32
+SWIFT_AUTH_CACHE_DIR=${SWIFT_AUTH_CACHE_DIR:-/var/cache/swift}
32 33
 
33 34
 # TODO: add logging to different location.
34 35
 
... ...
@@ -212,6 +213,7 @@ function configure_swift() {
212 212
     iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:authtoken admin_tenant_name $SERVICE_TENANT_NAME
213 213
     iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:authtoken admin_user swift
214 214
     iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:authtoken admin_password $SERVICE_PASSWORD
215
+    iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:authtoken signing_dir $SWIFT_AUTH_CACHE_DIR
215 216
 
216 217
     iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} filter:keystoneauth use
217 218
     iniuncomment ${SWIFT_CONFIG_PROXY_SERVER} filter:keystoneauth operator_roles
... ...
@@ -325,6 +327,10 @@ function init_swift() {
325 325
         swift-ring-builder account.builder rebalance
326 326
     } && popd >/dev/null
327 327
 
328
+    # Create cache dir
329
+    sudo mkdir -p $SWIFT_AUTH_CACHE_DIR
330
+    sudo chown `whoami` $SWIFT_AUTH_CACHE_DIR
331
+    rm -f $SWIFT_AUTH_CACHE_DIR/*
328 332
 }
329 333
 
330 334
 function install_swift() {