Commit Graph

212 Commits

Author SHA1 Message Date
zdover23
df10995f7a
Merge pull request #40378 from zdover23/wip-doc-cephadm-osd-declarative-state-rewrite-2021-Mar-25
doc/cephadm: rewrite "delcarative state" in osd.rst

Reviewed-by: Sage Weil <sweil@redhat.com>
2021-04-19 23:03:21 +10:00
Sage Weil
b0f1146a6c Merge PR #40712 into master
* refs/pull/40712/head:
	doc/cephadm: wrong command for single daemon events

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
2021-04-16 11:31:24 -04:00
Zac Dover
9f2d892cc1 doc/cephadm: rewrite "delcarative state" in osd.rst
This commit improves the wording of the "Declarative
State" section of the "OSD Service" chapter of the
Cephadm Guide.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-04-15 00:47:18 +10:00
Sage Weil
d72c61b850 doc/cephadm: remove big warning about stability
It's the first item on the toctree that follows.

Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-13 16:53:08 -04:00
Sage Weil
5347726119 doc/cepham/compatibility: rgw-ha -> ingress; note possibility of breaking changes
Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-13 16:53:08 -04:00
Sage Weil
bbf6a12752 mgr/cephadm: ingress: add optional virtual_interface_networks
It may be that the virtual IP we want to use is not in the same network
as any existing IPs on the host.  In that case, allow the spec to specify
a list of networks to match against existing IPs so that a match will
identify an ethernet interface to use.

Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-13 16:53:08 -04:00
Sage Weil
99b9f032de doc/cephadm/rgw: clean up example spec
Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-13 16:53:08 -04:00
Sage Weil
702829f7df doc/cephadm/rgw: add note about which ethernet interface is used
Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-13 16:53:08 -04:00
Sage Weil
2f33c6ebbc cephadm: make keepalived unit fiddle sysctl settings
No need to make the user adjust these manually.

Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-13 16:53:08 -04:00
Sage Weil
ef2d92aab2 doc/cephadm/rgw: update docs for ingress service
Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-13 16:52:42 -04:00
Adam King
31959dd6d3 doc/cephadm: wrong command for single daemon events
Fixes: https://tracker.ceph.com/issues/50257

Signed-off-by: Adam King <adking@redhat.com>
2021-04-08 15:43:45 -04:00
Guillaume Abrioux
6602eb7e7c doc/cephadm: fix a typo
This fixes a small typo in the cephadm/iscsi documentation

s/iSCSI Ganesha gateway/iSCSI gateway/

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2021-04-07 17:02:05 +02:00
Sage Weil
91eb165167 Merge PR #40508 into master
* refs/pull/40508/head:
	mgr/cephadm: fix orch host add with multiple labels and no addr

Reviewed-by: Sage Weil <sage@redhat.com>
2021-04-05 14:14:12 -04:00
Sage Weil
d49bc22a10 Merge PR #40500 into master
* refs/pull/40500/head:
	doc/cephadm: remove keepalived_user from haproxy docs

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>
2021-04-05 09:16:34 -04:00
Zac Dover
577e45c78b doc/cephadm: rewrite osd.rst "Remove an OSD"
This commit rewrites the entire "Remove an OSD"
section of the "OSD Service" chapter of the
cephadm book.

I got carried away and didn't break this one into
four smaller PRs, and I'm sorry in advance to
whomever ends up reviewing this. I'll break "Advanced
OSD Service Specifications", the next section in the
queue, into multiple sections.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-04-01 00:38:58 +10:00
zdover23
2bd3425759
Merge pull request #40368 from zdover23/wip-doc-cephadm-osd-deploy-osd-rewrite-2021-Mar-25
doc/cephadm: rewrite part of "deploy osds"

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2021-04-01 00:25:13 +10:00
zdover23
ca43423345
Merge pull request #40374 from zdover23/wip-doc-cephadm-osd-dry-run-rewrite-2021-Mar-25
doc/cephadm: rewrite "dry run" section in osd.rst

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2021-04-01 00:24:37 +10:00
Daniel Pivonka
92ad1420c8 mgr/cephadm: fix orch host add with multiple labels and no addr
Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
2021-03-31 10:16:43 -04:00
Daniel Pivonka
d4630eaab4 doc/cephadm: remove keepalived_user from haproxy docs
keepalived_user is not used and not required

Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
2021-03-30 10:13:02 -04:00
Daniel Pivonka
41a1df1b96 doc/cephadm: fix rgw realm and zone flags
Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
2021-03-26 16:18:28 -04:00
Zac Dover
e61237f3a1 doc/cephadm: rewrite "dry run" section in osd.rst
This rewrites the "dry run" section of the "OSD Service"
chapter of the Cephdam documentation. This commit makes
minor changes that reduce the cognitive load of the
reader.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-03-25 01:48:20 +10:00
Sage Weil
e6e265f309 Merge PR #40350 into master
* refs/pull/40350/head:
	doc/cephadm: explicitly show host requirments in adding host section

Reviewed-by: Sage Weil <sage@redhat.com>
2021-03-24 11:39:53 -04:00
Zac Dover
5f1ce2f6e8 doc/cephadm: rewrite part of "deploy osds"
This reorganizes the section "Deploy OSDs"
in the "OSD Service" chapter of the Cephadm
Guide. Two new sections, "Listing Storage
Devices" and "Creating New OSDs" gather
information under headings in a sensible way,
making the information more accessible to someone
skimming this Guide.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-03-25 00:39:01 +10:00
zdover23
5a35a3f5b7
Merge pull request #40344 from zdover23/wip-doc-cephadm-index-rewrite-2021-Mar-23
doc/cephadm: rewrite "index.rst"

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2021-03-25 00:09:01 +10:00
Zac Dover
dfd205dca7 doc/cephadm: rewrite "index.rst"
This PR rewrites the three paragraphs at the
front of the cephadm guide, increasing their
elegance and removing ambiguities.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-03-24 20:18:48 +10:00
Daniel Pivonka
b28fd9838e doc/cephadm: explicitly show host requirments in adding host section
Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
2021-03-23 14:56:33 -04:00
Zac Dover
49352a3150 doc/cephadm: rewrite osd.rst - list devices
This PR rewrites the "List Devices" section of
the OSD chapter of the Cephadm guide. This PR
is a simple grammar-and-elegance improvement.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-03-24 02:23:46 +10:00
Jeff Layton
bf69cdc689 doc: fixes for cephadm documentation
Be sure to note that python 3 is a prerequisite. Minimal centos 8
installs don't have it, for instance.

Also, we probably don't want to hardcode an octopus URL into the
suggested curl command. Change it to fill that in with
"|stable-release|", which should always point to the latest released
version name.

Fixes: https://tracker.ceph.com/issues/49806
Signed-off-by: Jeff Layton <jlayton@redhat.com>
2021-03-17 20:58:56 +08:00
Sage Weil
0d3df9b959 Merge PR #39931 into master
* refs/pull/39931/head:
	mgr/cephadm: fall back to service spec port if none on DaemonDescription
	mgr/cephadm: fix redeploy when daemons have ip:port
	mgr/cephadm/schedule: add test case
	qa/suites/rados/cephadm/smoke-roleless: add rgw test on many ports
	doc/cephadm/rgw: update docs to show count-per-host
	mgr/cephadm: add support for rgw_frontend_type (beast or civetweb)
	mgr/cephadm: remove ssl_frontend_ssl_key from RGWSpec
	mgr/cephadm: fix beast private key config option
	mgr/cephadm: fix rgw ssl cert/key config-key path
	mgr/cephadm/schedule: dynamically assign ports for rgw
	mgr/cephadm/schedule: only 1 port in DaemonPlacement
	mgr/cephadm: move rgw frontend logic into RgwService
	mgr/cephadm/schedule: return DaemonPlacement instead of HostPlacementSpec
	mgr/cephadm/schedule: remove unused methods
	mgr/cephadm: propagate ip:port from CephadmDaemoNDeploySpec to deployment
	cephadm: populate ports if known and not included in unit.meta
	mgr/cephadm: gather and report ports in 'orch ps' output

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2021-03-16 13:04:55 -04:00
Zac Dover
25d9429d66 doc/cephadm: break mon section into sections
This PR breaks the "Deploy Additional Monitors" section
of the cephadm documentation into several subsections
whose titles spotlight the matter under discussion in
those respective subsections.

inb4: Another PR is on deck that rewrites the sentences
in this chapter of the cephadm documentation. I'd like
to get this chapter broken up into these subsections before
I rewrite those sentences. So I'm hoping for no grammatical
mission creep on this one. The grammar and clarity updates
are coming.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-03-17 02:15:48 +10:00
zdover23
fcf8fbcb6e
Merge pull request #40141 from zdover23/wip-doc-cephadm-mon-deploying-add-rewrite-2021-Mar-16
doc/cephadm: rewrite "deploying add. mons"

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
2021-03-17 01:10:01 +10:00
Zac Dover
c605750db2 doc/cephadm: rewrite "deploying add. mons"
This rewrites the section "Deploying Additional
Monitors (Beyond the Default Three)" for elegance
and clarity.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-03-16 09:02:19 +10:00
Sage Weil
09618354e9 doc/cephadm/rgw: update docs to show count-per-host
Signed-off-by: Sage Weil <sage@newdream.net>
2021-03-15 18:55:16 -04:00
Sebastian Wagner
f29cae053b
Merge pull request #39916 from zdover23/wip-doc-cephadm-adoption-preparation-2021-Mar-08
doc/cephadm: rewrite "preparation" in adoption.rst

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
2021-03-15 15:25:39 +01:00
Zac Dover
2a47caff72 doc/cephadm: rewrite "preparation" in adoption.rst
This rewrites the "Adoption" section of
preparation.rst in the Cephadm manual.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-03-12 05:42:32 +10:00
Sebastian Wagner
f744878d82
Merge pull request #39875 from zdover23/wip-doc-cephadm-adoption-overview-and-limitations-rewrite-2021-Mar-06
doc/cephadm: rewrite part of adoption.rst

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
2021-03-11 12:19:37 +01:00
Sebastian Wagner
543fc00951
Merge pull request #40008 from mgfritch/cephadm-nfsv3-deprecate
doc/cephadm: add note about deprecation of NFSv3

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
2021-03-11 12:06:20 +01:00
Sebastian Wagner
5f7a2ab76f
Merge pull request #39932 from mgfritch/custom-monitoring-j2
doc/cephadm: update section on applying custom config (j2) 

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
2021-03-11 11:44:17 +01:00
Michael Fritch
a52bd99a60
doc/cephadm: add note about deprecation of NFSv3
Signed-off-by: Michael Fritch <mfritch@suse.com>
2021-03-10 13:17:23 -07:00
Sebastian Wagner
b6a2dfc777
Merge pull request #39877 from liewegas/cephadm-rgw-simplification
mgr/cephadm: simplify handling for rgw

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Or Friedmann <ofriedma@redhat.com>
2021-03-10 13:58:37 +01:00
Sebastian Wagner
744edab3ff
Merge pull request #39541 from pcuzner/config-checker
mgr/cephadm: Provide an integrated configuration validation feature

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
2021-03-10 13:37:10 +01:00
Sebastian Wagner
d93d1ed43f
Merge pull request #39599 from pcuzner/cephadm-with-lsm
mgr/cephadm:Enable cephadm device scan to use libstoragemgmt

Reviewed-by: Dan Mick <dmick@redhat.com>
2021-03-10 12:14:37 +01:00
Michael Fritch
9441d66318
doc/cephadm: remove step to restart the mgr
a restart of the mgr does not appear to be necessary
after a `ceph config-key set ...`

Signed-off-by: Michael Fritch <mfritch@suse.com>
2021-03-09 21:06:27 -07:00
Michael Fritch
b4b6f359df
doc/cephadm: use reconfig instead of redeploy
`reconfig` can be used to apply a change to either
the tls/ssl cert or a custom configuration file (j2)

Signed-off-by: Michael Fritch <mfritch@suse.com>
2021-03-09 21:06:20 -07:00
Michael Fritch
b58b0de777
doc/cephadm: update custom j2 config-key name
introduced by:
cd79c9912a

Signed-off-by: Michael Fritch <mfritch@suse.com>
2021-03-09 21:06:12 -07:00
Sage Weil
50bc491373 doc: update docs
Signed-off-by: Sage Weil <sage@newdream.net>
2021-03-09 14:29:39 -05:00
Zac Dover
c011121893 doc/cephadm: rewrite "adoption process"
This rewrites the "Adoption Process" section
of the "Converting and Existing Cluster to
cephadm" chapter of the Cephadm guide.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-03-10 00:29:55 +10:00
Zac Dover
a445653511 doc/cephadm: rewrite part of adoption.rst
This PR adds a bit of explanatory text to the
section of the cephadm docs that explains how
to convert Ceph deployments that were not deployed
with cephadm to deployments that can be managed by
the cephadm command line tool.
2021-03-08 11:20:24 +10:00
Josh
ffc08b930b doc/cephadm: use 'apt' to install cephadm on Ubuntu
Adjusted so Ubuntu command uses 'apt' and added Fedora since that uses 'dnf'.
2021-03-07 19:16:21 +08:00
Sebastian Wagner
d5fee3e64a
Merge pull request #39809 from sebastian-philipp/cephadm-compatibilty
doc/cephadm: remove warning about cephadm in production 

Reviewed-by: Sage Weil <sage@redhat.com>
2021-03-05 12:20:33 +01:00