Merge swift-recon addition from csmith.
This commit is contained in:
commit
1982f05141
|
@ -2,10 +2,10 @@ Overview
|
||||||
--------
|
--------
|
||||||
|
|
||||||
This charm provides the swift-storage component of the OpenStack Swift object
|
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
|
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
|
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
|
For more information about Swift and its architecture, visit the official
|
||||||
project website at http://swift.openstack.org.
|
project website at http://swift.openstack.org.
|
||||||
|
|
|
@ -80,7 +80,11 @@ bind_port = $port
|
||||||
workers = 2
|
workers = 2
|
||||||
|
|
||||||
[pipeline:main]
|
[pipeline:main]
|
||||||
pipeline = $1-server
|
pipeline = recon $1-server
|
||||||
|
|
||||||
|
[filter:recon]
|
||||||
|
use = egg:swift#recon
|
||||||
|
recon_cache_path = /var/cache/swift
|
||||||
|
|
||||||
[app:$1-server]
|
[app:$1-server]
|
||||||
use = egg:swift#$1
|
use = egg:swift#$1
|
||||||
|
|
|
@ -21,7 +21,9 @@ function install_hook {
|
||||||
install --no-install-recommends $PACKAGES || exit 1
|
install --no-install-recommends $PACKAGES || exit 1
|
||||||
|
|
||||||
[[ ! -d /etc/swift ]] && mkdir /etc/swift
|
[[ ! -d /etc/swift ]] && mkdir /etc/swift
|
||||||
|
[[ ! -d /var/cache/swift ]] && mkdir /var/cache/swift
|
||||||
chown swift:swift /etc/swift
|
chown swift:swift /etc/swift
|
||||||
|
chown -R swift:swift /var/cache/swift
|
||||||
configure_rsyncd
|
configure_rsyncd
|
||||||
swift-init all stop || true
|
swift-init all stop || true
|
||||||
setup_storage
|
setup_storage
|
||||||
|
|
Loading…
Reference in New Issue