Commit Graph

5034 Commits

Author SHA1 Message Date
AntonOks
905281b713 doc: added some Civetweb configuration options
Signed-off-by: Anton Oks <anton.oks@gmx.de>
2018-09-20 21:31:49 +02:00
Sage Weil
57c34b1905 Merge PR #24197 into master
* refs/pull/24197/head:
	doc: remove Calamari content from ceph-deploy

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2018-09-20 12:16:05 -05:00
Andrew Schoen
0def1a8349
Merge pull request #24201 from alfredodeza/wip-rm36088
ceph-volume  batch: allow journal+block.db sizing on the CLI

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
2018-09-20 11:53:14 -05:00
Alfredo Deza
042c2cbe47 doc/man/ceph-volume update batch command with new sizing flags
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-09-20 11:02:14 -04:00
Xie Xingguo
a3e58900bb
Merge pull request #24175 from xiaomanh/master
doc: Fix Spelling Error In File dynamicresharding.rst

Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-09-20 22:03:14 +08:00
John Spray
c25b26c8a5 doc: remove Calamari content from ceph-deploy
Signed-off-by: John Spray <john.spray@redhat.com>
2018-09-20 13:13:04 +01:00
Mykola Golub
ecdf8cd6b2 rbd: add config commands
Signed-off-by: Mykola Golub <mgolub@suse.com>
2018-09-20 10:35:18 +03:00
Patrick Donnelly
f113fa80a9
cephfs: remove vestiges of mds deactivate
Fixes: http://tracker.ceph.com/issues/24001

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-09-19 15:23:38 -07:00
Sage Weil
41c67ab1be
Merge pull request #24160 from jdurgin/wip-rados-lead
doc/dev/index: update rados lead

Reviewed-by: Sage Weil <sage@redhat.com>
2018-09-19 13:45:32 -05:00
Casey Bodley
bd6d3f61e1
Merge pull request #24059 from cbodley/wip-rgw-opstate-rm
rgw, cls: remove cls_statelog and rgw opstate tracking

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2018-09-19 14:01:04 -04:00
Lenz Grimmer
01c2ea52c1
Merge pull request #24128 from ricardoasmarques/wip-optional-user-password
mgr/dashboard: User password should be optional

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
2018-09-19 16:44:51 +02:00
Casey Bodley
4cf38b90d3 common: remove config variables related to rgw opstate
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2018-09-19 10:32:55 -04:00
Casey Bodley
5cb54ecf87 radosgw-admin: remove opstate commands
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2018-09-19 10:32:55 -04:00
Ricardo Marques
49ba4a7b84 mgr/dashboard: User password should be optional
Fixes: https://tracker.ceph.com/issues/36031

Signed-off-by: Ricardo Marques <rimarques@suse.com>
2018-09-19 13:49:22 +01:00
Sage Weil
3aa8005050 Merge PR #24109 into master
* refs/pull/24109/head:
	doc: update docs for device management
	mgr: make devicehealth always-on
	mgr/devicehealth: do not create metrics pool on get-device-metrics
	mgr/devicehealth: converge OPTIONS and DEFAULTS
	mgr/devicehealth: squelch health warnings for unused devices
	mgr/devicehealth: show-health-metrics -> get-health-metrics

Reviewed-by: John Spray <john.spray@redhat.com>
2018-09-19 07:33:32 -05:00
xiaomanh
2d2a8a12b5 doc: Fix Spelling Error In File dynamicresharding.rst
Signed-off-by: xiaomanh <huangxiaoman@cmss.chinamobile.com>
2018-09-19 19:09:34 +08:00
Josh Durgin
2d79537236 doc/dev/index: update rados lead
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2018-09-19 00:26:13 -07:00
Sage Weil
5cd067b16b Merge PR #24104 into master
* refs/pull/24104/head:
	mgr/diskprediction: add prototype diskprediction module

Reviewed-by: John Spray <john.spray@redhat.com>
2018-09-18 07:08:05 -05:00
Rick Chen
4abb79f159 mgr/diskprediction: add prototype diskprediction module
This module is written by Rick Chen <rick.chen@prophetstor.com> and
provides both a built-in local predictor and a cloud mode that queries
a cloud service (provided by ProphetStor) to predict device failures.

Signed-off-by: Rick Chen <rick.chen@prophetstor.com>
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-17 08:20:57 -05:00
李丙洋 10208981
64613065ac doc: Fix Typos of Developer Guide
Signed-off-by: Li Bingyang <li.bingyang1@zte.com.cn>
2018-09-17 09:59:29 +08:00
Mykola Golub
a68be2b452
Merge pull request #24036 from dillaman/wip-24688
rbd-mirror: optionally extract peer secrets from config-key

Reviewed-by: Mykola Golub <mgolub@suse.com>
2018-09-16 11:53:04 +03:00
Sage Weil
3e791d1f9e doc: update docs for device management
Move this out of mgr section and into rados operations.

Leave a placeholder for failure prediction, which is still a work in
progress.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-14 14:06:41 -05:00
Sage Weil
53cb6ac0d4 mgr/devicehealth: show-health-metrics -> get-health-metrics
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-14 12:43:58 -05:00
Nathan Cutler
ee35f017fc
Merge pull request #23972 from badone/wip-documentation-add-12.2.8-release
doc/releases/schedule: Add Luminous 12.2.8

Reviewed-by: Nathan Cutler <ncutler@suse.com>
2018-09-14 09:52:59 +02:00
Nathan Cutler
0e0c88d930
Merge pull request #24099 from badone/wip-mimic-13-2-0-date-correction
doc/releases: Mark Mimic first release as June

Reviewed-by: Nathan Cutler <ncutler@suse.com>
2018-09-14 09:52:19 +02:00
Brad Hubbard
d109015436 doc/releases: Mark Mimic first release as June
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2018-09-14 15:05:52 +10:00
李丙洋 10208981
d1a38aa1ae doc: Fix Typos of Developer Guide
Signed-off-by: Li Bingyang <li.bingyang1@zte.com.cn>
2018-09-14 09:23:22 +08:00
Mykola Golub
ad9fc49776
Merge pull request #23896 from Songweibin/wip-group-snap-rollback
rbd: add group snap rollback method

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
2018-09-13 19:35:10 +03:00
Jason Dillaman
900e30d1bb doc/rbd: update mirroring to include new peer secret config-key actions
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-09-13 09:58:34 -04:00
Jason Dillaman
5e768d5d18 mon: added bootstrap-rbd-mirror/rbd-mirror mon profiles
The rbd-mirror daemon will require permission to read config-keys
from the "rbd/mirror/" prefix. These new profiles (and the new
associated bootstrap-rbd-mirror user) provide the required
permissions.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-09-13 09:58:34 -04:00
Casey Bodley
39f8375aee
Merge pull request #23660 from falcon78921/wip-multisite-docs
doc: updated multisite documentation

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-09-13 08:53:59 -04:00
李丙洋 10208981
da96cc919c doc: Fix Spelling Error in Developer Guide
Signed-off-by: Li Bingyang <li.bingyang1@zte.com.cn>
2018-09-13 09:17:46 +08:00
Patrick Donnelly
29f159fdec
Merge PR #24052 into master
* refs/pull/24052/head:
	doc: update mds stat output

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
2018-09-12 09:14:28 -07:00
songweibin
dec2ea83cf tools/rbd: support group snap rollback CLI
Signed-off-by: songweibin <song.weibin@zte.com.cn>
2018-09-12 23:42:15 +08:00
Lenz Grimmer
e03d228ab0
Merge pull request #24030 from LenzGr/mgr-dashboard-documentation
doc: Updated Mgr Dashboard documentation

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2018-09-12 16:01:29 +02:00
Jos Collin
1485e86a2c
doc: update mds stat output
Signed-off-by: Jos Collin <jcollin@redhat.com>
2018-09-12 10:27:22 +05:30
Patrick Donnelly
e78115ef3b
Merge PR #23728 into master
* refs/pull/23728/head:
	doc: suppored features of kernel client

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-09-11 10:44:04 -07:00
Patrick Donnelly
c4c788db31
Merge PR #23824 into master
* refs/pull/23824/head:
	doc/cephfs: add notes on application best practices

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2018-09-11 10:14:20 -07:00
John Spray
0551d0e14b
Merge pull request #23497 from noahdesu/insights
mgr/insights: insights reporting module

Reviewed-by: John Spray <john.spray@redhat.com>
2018-09-11 15:56:10 +01:00
John Spray
34e82cb436
Merge pull request #23464 from wido/influx-optimize
mgr/influx: Use Queue to store points which need to be written

Reviewed-by: John Spray <john.spray@redhat.com>
2018-09-11 15:16:12 +01:00
Lenz Grimmer
44be910c30 doc: Updated Mgr Dashboard documentation
Fixed a typo, added a note about the embedding of Grafana dashboards
still being WIP.

Signed-off-by: Lenz Grimmer <lgrimmer@suse.com>
2018-09-11 15:43:46 +02:00
Yan, Zheng
f7ace59e53 doc: suppored features of kernel client
Fixes: http://tracker.ceph.com/issues/27209
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
2018-09-11 21:40:20 +08:00
Kefu Chai
510d9e1345
Merge pull request #23723 from xiexingguo/wip-list-missing
osd/PrimaryLogPG: rename list_missing -> list_unfound command

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2018-09-11 20:25:21 +08:00
Lenz Grimmer
4c61c67fa5 doc: Updated Mgr Dashboard feature description, added references
Reworded the description of the user/role management feature, clarified
that it can be configured on both the CLI and the WebUI. Added labels for
referencing the user/role management and SSL configuration sections.

Signed-off-by: Lenz Grimmer <lgrimmer@suse.com>
2018-09-11 14:12:04 +02:00
李丙洋 10208981
53feb4ad4e doc: Fix Spelling Error of Radosgw
Signed-off-by: Li Bingyang <li.bingyang1@zte.com.cn>
2018-09-11 15:30:20 +08:00
John Spray
8279d8713e doc/cephfs: add notes on application best practices
Signed-off-by: John Spray <john.spray@redhat.com>
2018-09-10 15:53:42 +01:00
Sage Weil
3a34c9ee38 Merge PR #23965 into master
* refs/pull/23965/head:
	doc/dev/msgr2: better formatting
	doc/dev/msgr2: clarify padding alignment
	doc/dev/msgr2: tweak message flow handshake
	doc/dev/msgr2: remove stream concept, streamline auth

Reviewed-by: Ricardo Dias <rdias@suse.com>
2018-09-10 09:23:32 -05:00
Kefu Chai
69d81c55ce
Merge pull request #23833 from falcon78921/wip-docs-34539
doc/rados: fixed hit set type link

Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-09-10 15:13:20 +08:00
James McClune
f38426a766 doc: fixed hit set type link
Fixed reference link for hit set type value. Restructured wording in description.
Fixes: https://tracker.ceph.com/issues/34539

Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>
2018-09-09 21:41:08 -04:00
李丙洋 10208981
bf56495b98 doc: Fix Spelling Error of Radosgw
Signed-off-by: Li Bingyang <li.bingyang1@zte.com.cn>
2018-09-10 09:21:31 +08:00
Sage Weil
5eba9ba074 doc/rados/operations/placement-groups: a few minor corrections
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-07 12:09:42 -05:00
Sage Weil
856a01fcfc doc/man/8/ceph: drop enumeration of pg states
This is more maintainable.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-07 12:09:42 -05:00
Sage Weil
5ff6bbf63d doc/dev/placement-groups: drop old 'splitting' reference
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-07 12:09:05 -05:00
Sage Weil
968917bc54 doc/rados/operations/placement-groups: update to describe pg_num reductions too
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-07 12:09:05 -05:00
Sage Weil
513239274e doc/rados/operations: remove reference to lpgs
These were removed years ago.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-07 12:09:05 -05:00
Sage Weil
bbf952125e osd: notify mon when pending PGs are ready to merge
When a PG is in the pending merge state it is >= pg_num_pending and <
pg_num.  When this happens quiesce IO, peer, wait for activate to commit,
and then notify the mon that we are idle and safe to merge.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-07 12:08:40 -05:00
Sage Weil
b2240bce41 doc/dev/msgr2: better formatting
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-07 11:01:33 -05:00
Sage Weil
b24e187b5a doc/dev/msgr2: clarify padding alignment
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-07 11:01:24 -05:00
Brad Hubbard
b6fdcfc7e3 doc/releases/schedule: Add Luminous 12.2.8
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2018-09-07 10:01:43 +10:00
Sage Weil
5eb0620f12 doc/dev/msgr2: tweak message flow handshake
- specify entity_name_t in TAG_IDENT instead of every msg
header
- add more notes
- include optional padding before the data segment for a msg

Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-06 17:30:25 -05:00
Sage Weil
4b50277666 doc/dev/msgr2: remove stream concept, streamline auth
- Remove stream concept.  it was incompletely/poorly
specified, and we dno't actually want to implement it now. We
can do it later now that we have a banner that advertises
features more clearly.

- Simplify the auth messages a bit: make a MORE message that
isn't a request (or reply), and a final DONE.  DONE comes from
the server, not the client.  Drop the SET_METHOD which can be
rolled into the REQUEST message.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-06 14:29:42 -05:00
Ruben Kerkhof
d05cd1a3e6 doc: remove deprecated 'scrubq' from ceph(8)
The option was removed in a30cbe9adea34782be8699c010d4281d245feb6b

Fixes: http://tracker.ceph.com/issues/35813

Signed-off-by: Ruben Kerkhof <ruben@rubenkerkhof.com>
2018-09-06 16:24:16 +02:00
huanwen ren
821b6b486c
Merge pull request #23836 from sepia-liu/wip-cephfuse-doc
doc/cephfs: fixup add/remove mds docs
2018-09-06 18:50:57 +08:00
Xie Xingguo
7a8ed0fe2c
Merge pull request #23948 from libingyang-zte/master
doc: Fix Spelling Error of Radosgw

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-09-06 12:10:20 +08:00
xie xingguo
85ba2f0a82 osd/PrimaryLogPG: s/list_missing/list_unfound/
Also:
- Do not print **offset** until specified
- Count missing objects correctly (used to be primary's local missing)

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-09-06 09:52:20 +08:00
Xie Xingguo
42a518317a
Merge pull request #23926 from Gangbiao/lgb-devel
doc: Document correction

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-09-06 09:30:25 +08:00
李丙洋 10208981
b91d54976f doc: Fix Spelling Error of Radosgw
Signed-off-by: Li Bingyang <li.bingyang1@zte.com.cn>
2018-09-06 08:43:11 +08:00
Patrick Donnelly
a68a827cec
Merge PR #23907 into master
* refs/pull/23907/head:
	doc: Fix Spelling Error of Cephfs Shell

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
2018-09-05 09:41:23 -07:00
Sage Weil
f8d728620f
Merge pull request #23909 from theanalyst/doc/releases/12.2.8
doc: release notes for 12.2.8 luminous
2018-09-05 10:43:26 -05:00
Abhishek Lekshmanan
5b5dbe257b doc: release notes for 12.2.8 luminous
- Add a special note for upgrades from earlier releases
- Add a notable section mentioning the scrub and rgw options

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2018-09-05 16:38:45 +02:00
Gangbiao Liu
8baf1a219d doc: Document correction
"doc/ceph-volume/lvm/prepare.rst":  Remove duplicated words
    "doc/radosgw/cloud-sync-module.rst": Remove duplicated words

Signed-off-by: Gangbiao Liu <liugangbiao@cmss.chinamobile.com>
2018-09-05 11:05:18 +08:00
Gangbiao Liu
c7f579ad44 doc: Fix Spelling Error In File "ceph.rst" and "rbd.rst"
Signed-off-by: Gangbiao Liu <liugangbiao@cmss.chinamobile.com>
2018-09-05 01:51:27 +08:00
李丙洋 10208981
1b82e61379 doc: Fix Spelling Error of Cephfs Shell
Signed-off-by: Li Bingyang <li.bingyang1@zte.com.cn>
2018-09-04 17:22:17 +08:00
李丙洋 10208981
6ee66cc857 doc: Fix Spelling Error of Rados Operations
Signed-off-by: Li Bingyang <li.bingyang1@zte.com.cn>
2018-09-04 14:01:55 +08:00
李丙洋 10208981
97d1b83dea doc: Fix Spelling Error of Rados Operations
Signed-off-by: Li Bingyang <li.bingyang1@zte.com.cn>
2018-09-04 09:17:28 +08:00
liu wei
a77ca3357c doc/cephfs: fixup add/remove mds docs
Signed-off-by: liu wei <liu.wei8196@zte.com.cn>
2018-09-03 23:13:59 +08:00
李丙洋 10208981
ba7604bdb4 doc: Fix Spelling Error of Rados Operations
Signed-off-by: Li Bingyang <li.bingyang1@zte.com.cn>
2018-09-03 09:57:44 +08:00
David Wahler
ebac6e16b9 doc: add note about LVM volumes to ceph-deploy quick start
This commit also fixes some incorrect indentation that was causing
previous steps in the same section to be incorrectly numbered.

Signed-off-by: David Wahler <dwahler@gmail.com>
2018-09-02 10:43:07 -05:00
Sage Weil
487cfabc4f radosgw-admin: remove -a --auth-uid arg
It was already a no-op.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 15:54:58 -05:00
Sage Weil
b700f0fbfd rgw: remove auid member from RGWUserInfo
Unused.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 15:54:58 -05:00
Sage Weil
5df1a2ee9e auth: remove auid member from EntityAuth
Note that for the keyring we still accept (but ignore) auid lines so that
we can parse old keyrings that have them.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 15:54:58 -05:00
Sage Weil
3ebdd47737 doc/dev/cephx_protocol: drop auid reference
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 15:54:58 -05:00
Sage Weil
b83b4d5874 mon/OSDMonitor: remove 'osd pool {get,set} <name> auid ...'
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 15:54:58 -05:00
Sage Weil
1cbca88f83 pybind/rados: drop auid arg to pool_create
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 09:27:36 -05:00
Sage Weil
2c26fb0fe1 rados: drop mkpool, rmpool commands
- mkpool and rmpool users should use the normal cli/mon commands

Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 09:27:36 -05:00
Sage Weil
d6def8ba11 ceph-authtool: remove auid options
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 09:26:19 -05:00
Andrew Schoen
8a72f812d5
Merge pull request #23785 from alfredodeza/wip-rm34309
ceph-volume:  update batch documentation to explain filestore strategies

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
2018-08-30 09:14:36 -05:00
Sage Weil
84335576b7 Merge PR #23611 into master
* refs/pull/23611/head:
	mgr/devicehealth: fix exceptions
	doc/mgr/devicehealth: update docs
	mgr/devicehealth: leave health monitoring off by default
	mgr/devicehealth: add 'device monitoring {on,off}' commands
	mgr/devicehealth: 10m wakeup interval is sufficient
	mgr/devicehealth: scrape at scrape_interval intervals
	mgr/devicehealth: UTC everywhere
	mgr/devicehealth: fix sleep_interval configurable
2018-08-30 08:52:39 -05:00
Sage Weil
df71738d79 doc/mgr/devicehealth: update docs
- several new commands weren't documented

Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-29 12:30:24 -05:00
Alfredo Deza
28bbcb2baf doc/rados update invalid bash on bluestore migration
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-08-29 07:26:11 -07:00
Alfredo Deza
f8db9faf98 doc/man/ceph-volume uncomment flags that are now fully supported in batch
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-08-28 13:34:25 -07:00
Alfredo Deza
188f4ae80f doc/ceph-volume add filestore docs for batch
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-08-28 13:32:19 -07:00
Alfredo Deza
02652343c8 doc/ceph-volume uncomment section of newly supported batch operations
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-08-28 13:22:20 -07:00
Jason Dillaman
1b090ca41e
Merge pull request #23765 from chenzhua/master
doc: fix spelling errors in rbd doc

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-08-28 13:02:52 -04:00
Kai Wagner
d7f5c281c8 doc: fixed typo in cephfs snapshots
Signed-off-by: Kai Wagner <kwagner@suse.com>
2018-08-28 08:56:47 +02:00
Chen Zhenghua
f2d1f94322 doc: fix spelling errors in rbd doc
Signed-off-by: Chen Zhenghua <chen.zhenghua@zte.com.cn>
2018-08-28 14:56:16 +08:00
Chen Zhenghua
4108ecdb2c doc: fix cephfs spelling errors
Signed-off-by: Chen Zhenghua <chen.zhenghua@zte.com.cn>
2018-08-28 09:49:36 +08:00
Sage Weil
d08f65e7d8
Merge pull request #23750 from tchaikov/wip-doc-cephx
doc/dev/cephx_protocol: fix couple errors

Reviewed-by: Sage Weil <sage@redhat.com>
2018-08-27 10:51:10 -04:00
Casey Bodley
3dc8654f13
Merge pull request #20526 from k0ste/newfeature
docs: radosgw: ldap-auth: fixed option name 'rgw_ldap_searchfilter'

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-08-27 09:26:21 -04:00
Kefu Chai
d3fcbeeba0 doc/dev/cephx_protocol: fix couple errors
there are 3 phases of authentication and authorization in cephx:

0. proto = CEPH_AUTH_UNKNOWN, for start the session,
   create auth handlers on both sides.
1. GET_AUTH_SESSION_KEY, to get authenticated, the client will
   get the session ticket at the end of this phase. the session ticket,
   is actually also a service ticket for CEPH_ENTITY_TYPE_AUTH.
2. CEPHX_GET_PRINCIPAL_SESSION_KEY, to get authorized, the client
   will get the requested, service tickets at the end of this phase.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-27 17:50:54 +08:00