Commit Graph

239 Commits

Author SHA1 Message Date
Sebastian Wagner
f454a77d5e
Merge pull request #41186 from zdover23/wip-doc-cephadm-upgrade-starting-the-upgrade-2021-05-06
doc/cephadm: rewriting "starting the upgrade"

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
2021-05-06 13:18:09 +02:00
Sebastian Wagner
01d3646271
Merge pull request #41187 from zdover23/wip-doc-cephadm-upgrade-monitoring-the-upgrade-2021-05-06
doc/cephadm: rewrite "monitoring the upgrade"

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
2021-05-06 13:17:21 +02:00
Sebastian Wagner
e3b62e198f
Merge pull request #41188 from zdover23/wip-doc-cephadm-upgrade-cancelling-the-upgrade-2021-05-06
doc/cephadm: rewrite "cancelling the upgrade"

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
2021-05-06 13:16:04 +02:00
Sebastian Wagner
1fa93135a4
Merge pull request #41189 from zdover23/wip-doc-cephadm-upgrade-potential-problems-2021-05-06
doc/cephadm: rewrite "potential problems"

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
2021-05-06 13:15:27 +02:00
Zac Dover
630f0c8ad3 doc/cephadm: rewrite "using customized con..."
This PR rewrites the text in "Using Customized
Container Images" so that it is just a bit
clearer, and it also formats the prompt in the
text correctly.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-05-06 10:54:24 +10:00
Zac Dover
39c05445f2 doc/cephadm: rewrite "potential problems"
This PR adds correct prompts and slightly
reduces the cognitive load of the reader.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-05-06 10:44:23 +10:00
Zac Dover
8d531a7548 doc/cephadm: rewrite "cancelling the upgrade"
This PR corrects a single prompt in the section
"Cancelling the Upgrade".

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-05-06 10:34:26 +10:00
Zac Dover
f4c16f05b5 doc/cephadm: rewrite "monitoring the upgrade"
This PR adds correctly-formatted prompts and
makes slight alterations to the readability
of the text.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-05-06 10:30:02 +10:00
Zac Dover
9dc63ab22a doc/cephadm: rewriting "starting the upgrade"
This PR fixes the prompts in this section and
makes the sentences a tiny bit less onerous for
the reader.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-05-06 10:03:21 +10:00
zdover23
462c121653
Merge pull request #40502 from zdover23/wip-doc-podman-version-octopus-note-2021-30-Mar
doc/cephadm: add podman version note to install

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
2021-04-30 05:53:58 +10:00
Sage Weil
f8e872ce2f Merge PR #40924 into master
* refs/pull/40924/head:
	mgr/cephadm: check hostname resolution before adding host
	cephadm: provide a way to checkhost connection without /etc/hosts passed the shell
	doc/cephadm: remove /etc/hosts from list of hostname resoltion methods

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>
2021-04-28 14:27:07 -04:00
Sage Weil
75480f52e4 Merge PR #40941 into master
* refs/pull/40941/head:
	qa/suites/rados/cephadm/smoke-roleless: test client-keyring
	qa/tasks/cephadm.py: adjust client.admin key mode; place on all hosts
	cephadm: distribute client.admin keyring+conf to label:_admin on bootstrap
	doc/cephadm: document the default 'admin' label
	mgr/cephadm: 'ceph orch client-keyring ...' commands to manage keyring files
	mgr/cephadm: reimplement ceph.conf pushing
	mgr/cephadm: use _write_remote_file for ceph.conf
	mgr/cephadm: _write_remote_file helper
	mgr/cephadm: add placementspec for which hosts get ceph.conf

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Adam King <adking@redhat.com>
2021-04-28 14:26:35 -04:00
Zac Dover
3043aaaa8a doc/cephadm: add podman version note to install
This PR adds a note to the cephadm installation
guide that informs users that only podman version
2.0.0 and higher work with Ceph, with the
exception of podman version 2.2.1, which does
not work with Ceph. There is also a note regarding
kubic stable 3.0.1 working, but only with newer
kernels.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-04-29 00:08:18 +10:00
Sage Weil
b6b85edfe5 doc/cephadm: document the default 'admin' label
Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-27 09:45:54 -04:00
Sage Weil
b7e4f60178 mgr/cephadm: 'ceph orch client-keyring ...' commands to manage keyring files
Teach cephadm to manage keyring files on cluster hosts.  These keys must
already exist in the mon auth database--cephadm does not create them if
they don't exist (and will issue warnings to the log if they do not).

A ceph.conf is pushed implicitly along with the keyring file.

Each keyring added will be pushed to the hosts described by the placement
spec with the appropriate ownership and mode.  If the ownership, mode, or
path are modified, the files are rewritten or removed as need.

If the client-keyring entry is removed, the keyring files are removed.

Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-27 09:45:54 -04:00
zdover23
c6d1d0e031
Merge pull request #41030 from zdover23/wip-doc-adding-one-word-to-cephadm-nfs-2021-Apr-26
doc/cephadm: add a single word

Reviewed-by: Sage Weil <sweil@redhat.com>
2021-04-27 03:41:03 +10:00
zdover23
d526c9c390
Merge pull request #40992 from zdover23/wip-doc-cephadm-osd-advanced-adding-a-word-2021-apr-22
doc/cephadm: adding "device" to a sentence

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2021-04-27 00:34:26 +10:00
Zac Dover
3af9fe3fd8 doc/cephadm: add a single word
s/If the nfs-ganesha doesn't/If the
nfs-ganesha pool doesn't/

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-04-27 00:32:21 +10:00
Zac Dover
36426d6df5 doc/cephadm: rewrite "nfs.rst"
This PR makes a few (very small) stylistic
corrections, mostly typographical, to the text.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-04-26 23:04:04 +10:00
Zac Dover
72445fb724 doc/cephadm: adding "device" to a sentence
This tiny PR fixes an issue that I thought
I had squashed into PR#40914: a missing
word, "device", which was caught by Josh
Durgin during review.

Alas. I had not then caught it.

Here then it is, corrected at last.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-04-23 03:36:59 +10:00
Sage Weil
f1096030d9 mgr/cephadm: add placementspec for which hosts get ceph.conf
Add a config option to control which hosts (by default, *) get a
ceph.conf (if the bool manage_etc_ceph_ceph_conf option is enabled).

We don't modify the existing option because changing a type makes for a
messy migration: we have to sort out which section the config option is
in to change it.  Also, a simple on/off which is more friendly than
specifying "*" to enable something.

Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-21 22:13:02 -04:00
Sage Weil
54c37e0caa Merge PR #40938 into master
* refs/pull/40938/head:
	mgr/cephadm: less noise about osd specs
	mgr/cephadm: kick serve loop when adding/removing labels
	mgr/cephadm: do not place osds on _no_schedule hosts
	doc/cephadm: document _no_schedule label
	mgr/cephadm: fix 'orch ls' count to reflect schedulable hosts
	mgr/cephadm: do not schedule on _no_schedule hosts

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
2021-04-21 22:12:32 -04:00
Sage Weil
c7dae3ceb7 doc/cephadm: document _no_schedule label
Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-21 19:37:33 -04:00
Zac Dover
8648e04a6e doc/cephadm: osd.rst -- removing colons
This PR removes colons that weren't necessary.
This is a companion PR to PR#40996.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-04-22 04:14:24 +10:00
Zac Dover
91de0becbd doc/cephadm: osd: rewrite "additional opts"
This PR rewrites the "Additional Options"
subsection of the OSD chapter of the cephadm
guide.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-04-22 01:01:01 +10:00
Daniel Pivonka
c18932ef9f doc/cephadm: remove /etc/hosts from list of hostname resoltion methods
Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
2021-04-19 17:15:44 -04:00
Zac Dover
4106e331fb doc/cephadm: rewrite "advanced osd s. specs"
This PR improves the readbility and elegance of
the "Advanced OSD Service Specifications" section
of the OSD chapter of the cephadm guide.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-04-20 02:03:30 +10:00
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