Commit Graph

260 Commits

Author SHA1 Message Date
Zac Dover
52701fe865 doc/cephadm: s/the the/the
This removes an extraneous "the" and reworks a
sentence so that it adheres to the grammatical
rules of the English language.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-06-03 00:06:06 +10:00
Sebastian Wagner
9d3f5ae9c2
Merge pull request #41595 from zdover23/wip-doc-cephadm-serv-man-daemon-status-2021-05-30
doc/cephadm: enriching "daemon status"

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
2021-06-01 11:30:10 +02:00
Zac Dover
c02fb2b25b doc/cephadm: enriching "Service Specification"
This PR adds parallel construction to the "Service
Specification" section of the "Service Managment"
chapter of the cephadm documentation.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-05-31 14:15:56 +10:00
Zac Dover
80dcbc8019 doc/cephadm: enriching "daemon status"
This PR creates parallel structure for the
text in the "Daemon Status" section of the
cephadm Service Management chapter.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-05-31 13:55:20 +10:00
Sage Weil
1f30c0114d Merge PR #41483 into master
* refs/pull/41483/head:
	cephadm: stop passing --no-hosts to podman
	mgr/nfs: use host.addr for backend IP where possible
	mgr/cephadm: convert host addr if non-IP to IP
	mgr/dashboard,prometheus: new method of getting mgr IP
	doc/cephadm: remove any reference to the use of DNS or /etc/hosts
	mgr/cephadm: use known host addr
	mgr/cephadm: resolve IP at 'orch host add' time

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2021-05-27 19:14:53 -04:00
zdover23
fe258aad49
Merge pull request #41561 from zdover23/wip-doc-cephadm-s-mgmt-service-status-improvement-2021-05-26
doc/cephadm: enrich "service status"

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
2021-05-28 07:41:40 +10:00
Sage Weil
872668a9b3 doc/cephadm: remove any reference to the use of DNS or /etc/hosts
Signed-off-by: Sage Weil <sage@newdream.net>
2021-05-27 12:00:20 -04:00
Sebastian Wagner
674d6d96da
Merge pull request #41224 from adk3798/change-mon-stack-images-docs
doc/cephadm: recommend redeploying monitoring stack daemon after changing image

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
2021-05-27 11:54:24 +02:00
Zac Dover
31558e5568 doc/cephadm: enrich "service status"
This PR improves the syntax of the "Service
Status" section of the "Service Managment"
section of the cephadm guide. This includes
pretty significant reworking of the information
in the section, so vetting this one might be
annoying. Anyway, I think I've lowered the
cognitive load on the reader.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-05-27 11:28:38 +10:00
Sage Weil
9ab9cc26e2 Merge PR #41007 into master
* refs/pull/41007/head:
	qa/tasks/cephfs/test_nfs: fix info test
	doc/cephfs/fs-nfs-exports: document --ingress --virtual-ip
	mgr/nfs: move ingress vs virtual_ip check to cluster interface
	PendingReleaseNotes: clarify deprecated
	PendingReleaseNotes: note breaking CLI changes
	doc/cephadm/nfs: document nfs+ingress
	qa/suites/rados/cephadm/smoke-roleless: test nfs, nfs + ingress
	mgr/nfs: take --ingress argument to 'nfs cluster create'
	mgr/cephadm: adjust debug output for device refresh
	mgr/cephadm: ingress: fix log msg
	mgr/cephadm: fix logging of config/placement errors
	common/options: enable nfs module for new clusters
	cephadm: --stop-signal=SIGTERM
	mgr/orchestrator: default nfs pool, namespaces
	mgr/cephadm: nfs: create pool if it doesn't yet exist
	doc/cephadm/nfs: update
	mgr/nfs: change 'nfs cluster info'
	mgr/nfs: take optional virtual_ip for deploying ingress
	mgr/nfs: remove 'nfs cluster update'
	mgr/nfs: factor out ganesha pool creation
	mgr/nfs: delete -> rm for CLI
	mgr/nfs: add some type annotations
	python-common: fix IngressSpec yaml dump
	mgr/cephadm: ingress: remove eth0 default
	qa/tasks/cephadm: allow mounting volumes in shell
	cephadm: add -v arg to shell
	qa/tasks/vip: add 'vip.exec' task
	mgr/orchestrator: add --port arg to 'orch apply nfs'
	mgr/cephadm: nfs: add purge
	mgr/cephadm: ingress: support nfs
	mgr/cephadm: do not reconfigure daemons on deleted services
	mgr/cephadm: nfs: shell out to rados tool for conf creation
	mgr/cephadm: nfs: add rank to grace file from mgr module
	mgr/cephadm: nfs: bind ganesha to appropriate ip:port
	mgr/cephadm: enable ranked daemons for nfs
	mgr/cephadm: support creation of daemons with ranks
	mgr/cephadm: make _plan show removed daemon names
	mgr/cephadm/schedule: assign/map ranks
	mgr/cephadm: add rank[_generation] properties
	mgr/cephadm/inventory: store optional rank_map along with specs
	mgr/cephadm: include service_name is generated DaemonDescription
	mgr/orchestrator: include service_name in DaemonDescription dump
	mgr/cephadm/inventory: fix deleted check
	mgr/cephadm: simplify
	mgr/cephadm/schedule: make placement shuffle deterministic
	mgr/cephadm: document CephadmService flags

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
2021-05-25 16:17:44 -04:00
Zac Dover
db3af8e3d2 doc/cephadm: fix prompts in service-management.rst
This PR formats the prompts in service-managment.rst
properly.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-05-26 05:22:56 +10:00
Sage Weil
e51c3dcf01 doc/cephadm/nfs: document nfs+ingress
Signed-off-by: Sage Weil <sage@newdream.net>
2021-05-25 10:15:45 -04:00
Sage Weil
0e0f892668 doc/cephadm/nfs: update
- leave off pool/ns, since they should almost never be necessary.
- add port

Signed-off-by: Sage Weil <sage@newdream.net>
2021-05-25 10:15:45 -04:00
zdover23
3b787771ec
Merge pull request #41305 from zdover23/wip-doc-cephadm-monitoring-disabling-monitoring-2021-05-12
doc/cephadm: rewrite "disabling monitoring"

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2021-05-14 00:23:57 +10:00
Sage Weil
beb57679c6 Merge PR #39550 into master
* refs/pull/39550/head:
	mgr/cephadm: induce retune of osd memory on osd creation
	qa/tasks/cephadm.conf: autotune osd memory by default
	mgr/cephadm: do not autotune when _no_autotune_memory label is present
	mgr/cephadm: autotune osd memory
	common: add osd_memory_target_autotune
	mgr/cephadm: report memory usage, request (limit) in 'orch ps'
	doc/cephadm/host-management: document _admin group
	mgr/orchestrator: fix help formatting

Reviewed-by: Adam King <adking@redhat.com>
2021-05-13 09:57:14 -04:00
Sage Weil
1e4d20a592 mgr/cephadm: do not autotune when _no_autotune_memory label is present
Signed-off-by: Sage Weil <sage@newdream.net>
2021-05-12 11:02:34 -04:00
Sage Weil
85ea078787 mgr/cephadm: autotune osd memory
- set osd_memory_target_autotune=true to enable
- tuning is periodic (check every 10m by default)
- tuned values are reflected by osd_memory_target config options scoped
  to the host
- only make a change if it appears that we will affect at least 1 of the
  relevant OSDs
- attempt to clean out conflicting options.  (This is imperfect, since any
  manner of weirdly-scoped config options could be responsible; we only
  attempt to clean out one scoped directly to the osd name.)

Signed-off-by: Sage Weil <sage@newdream.net>
2021-05-12 11:02:34 -04:00
Sage Weil
eb3c38577a doc/cephadm/host-management: document _admin group
Signed-off-by: Sage Weil <sage@newdream.net>
2021-05-12 11:01:23 -04:00
Zac Dover
b67b6112ac doc/cephadm: rewrite "disabling monitoring"
* Simplified the text.
* Correctly formatted the prompts.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-05-12 22:54:54 +10:00
Adam King
9be84658fb doc/cephadm: recommend redeploying monitoring stack daemon after changing image
Fixes: https://tracker.ceph.com/issues/50687

Signed-off-by: Adam King <adking@redhat.com>
2021-05-11 14:16:25 -04:00
Zac Dover
b9554b0840 doc/cephadm: rewrite "config ssl/tls f. grafana"
This PR streamlines the grammar in the subsection
called "Configuring SSL/TLS for Grafana" in the
monitoring.rst file. It also corrects the prompt
rst.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-05-11 09:19:10 +10:00
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