diff --git a/README.md b/README.md index fc00652..2f244a5 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,10 @@ Overview -------- This charm provides the swift-storage component of the OpenStack Swift object -storage system. It can be deployed as part of its own stand-alone storage +storage system. It can be deployed as part of its own standalone storage cluster or it can be integrated with the other OpenStack components, assuming those are also managed by Juju. For Swift to function, you'll also need to -deploy an additional swift-proxy using the cs:precise/swift-storage charm. +deploy an additional swift-proxy using the cs:precise/swift-proxy charm. For more information about Swift and its architecture, visit the official project website at http://swift.openstack.org. diff --git a/hooks/swift-storage-node-common b/hooks/swift-storage-node-common index d6e96d0..342f351 100755 --- a/hooks/swift-storage-node-common +++ b/hooks/swift-storage-node-common @@ -80,7 +80,11 @@ bind_port = $port workers = 2 [pipeline:main] -pipeline = $1-server +pipeline = recon $1-server + +[filter:recon] +use = egg:swift#recon +recon_cache_path = /var/cache/swift [app:$1-server] use = egg:swift#$1 diff --git a/hooks/swift-storage-node-relations b/hooks/swift-storage-node-relations index 25c93da..ea53b48 100755 --- a/hooks/swift-storage-node-relations +++ b/hooks/swift-storage-node-relations @@ -21,7 +21,9 @@ function install_hook { install --no-install-recommends $PACKAGES || exit 1 [[ ! -d /etc/swift ]] && mkdir /etc/swift + [[ ! -d /var/cache/swift ]] && mkdir /var/cache/swift chown swift:swift /etc/swift + chown -R swift:swift /var/cache/swift configure_rsyncd swift-init all stop || true setup_storage