diff options
| author | John Wilkins <john.wilkins@inktank.com> | 2013-02-05 09:57:32 -0800 |
|---|---|---|
| committer | John Wilkins <john.wilkins@inktank.com> | 2013-02-05 09:57:32 -0800 |
| commit | 26f7db11c1c41e320daebcbf5017c8eceba52ebf (patch) | |
| tree | 06991a9876ccf142daeeec6194df7cf5e7e74827 | |
| parent | 4b4dba3061de83dbbcca50e8ecd47cc6e8a071be (diff) | |
| parent | d41b541189dc8bedeba40c442501280bfc0f3fae (diff) | |
| download | ceph-26f7db11c1c41e320daebcbf5017c8eceba52ebf.tar.gz | |
Merge pull request #38 from alram/master
Fixes in ./docs/radosgw/config.rst
| -rw-r--r-- | doc/radosgw/config.rst | 6 |
1 files changed, 4 insertions, 2 deletions
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 |