diff options
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | doc/radosgw/config.rst | 6 | ||||
| -rw-r--r-- | src/common/config_opts.h | 2 |
3 files changed, 7 insertions, 5 deletions
@@ -121,9 +121,9 @@ To build the source code, you must install the following: - libatomic-ops-dev - libboost-program-options-dev - libboost-thread-dev - +- libexpat1-dev For example: - $ apt-get install automake autoconf automake gcc g++ libboost-dev libedit-dev libssl-dev libtool libfcgi libfcgi-dev libfuse-dev linux-kernel-headers libcrypto++-dev libaio-dev libgoogle-perftools-dev libkeyutils-dev uuid-dev libatomic-ops-dev libboost-program-options-dev libboost-thread-dev + $ apt-get install automake autoconf automake gcc g++ libboost-dev libedit-dev libssl-dev libtool libfcgi libfcgi-dev libfuse-dev linux-kernel-headers libcrypto++-dev libaio-dev libgoogle-perftools-dev libkeyutils-dev uuid-dev libatomic-ops-dev libboost-program-options-dev libboost-thread-dev libexpat1-dev diff --git a/doc/radosgw/config.rst b/doc/radosgw/config.rst index 368adddc033..a4dc85aff4a 100644 --- a/doc/radosgw/config.rst +++ b/doc/radosgw/config.rst @@ -22,6 +22,7 @@ For example:: rgw socket path = /tmp/radosgw.sock log file = /var/log/ceph/radosgw.log +.. note:: ``host`` must be your machine hostname, not FQDN. Deploy ``ceph.conf`` ==================== @@ -331,7 +332,7 @@ by RGW. The following config options are available for Keystone integration:: [client.radosgw.gateway] - rgw keystone url = {keystone server url} + rgw keystone url = {keystone server url:keystone server admin port} rgw keystone admin token = {keystone admin token} rgw keystone accepted roles = {accepted user roles} rgw keystone token cache size = {number of tokens to cache} @@ -348,7 +349,8 @@ Keystone itself needs to be configured to point to RGW as an object-storage endpoint:: keystone service-create --name swift --type-object-store - keystone endpoint-create --service-id <id> --public-url http://radosgw.example.com/swift/v1 + keystone endpoint-create --service-id <id> --publicurl http://radosgw.example.com/swift/v1 \ + --internalurl http://radosgw.example.com/swift/v1 --adminurl http://radosgw.example.com/swift/v1 The keystone url is the Keystone admin RESTful api url. The admin token is the diff --git a/src/common/config_opts.h b/src/common/config_opts.h index 0d2e011721a..5e0449e3606 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -434,7 +434,7 @@ OPTION(filestore_kill_at, OPT_INT, 0) // inject a failure at the n'th OPTION(filestore_inject_stall, OPT_INT, 0) // artificially stall for N seconds in op queue thread OPTION(filestore_fail_eio, OPT_BOOL, true) // fail/crash on EIO OPTION(journal_dio, OPT_BOOL, true) -OPTION(journal_aio, OPT_BOOL, false) +OPTION(journal_aio, OPT_BOOL, true) OPTION(journal_block_align, OPT_BOOL, true) OPTION(journal_max_write_bytes, OPT_INT, 10 << 20) OPTION(journal_max_write_entries, OPT_INT, 100) |