Skip to content

octopus: cephadm batch backport August (1)#36450

Merged
sebastian-philipp merged 45 commits intoceph:octopusfrom
sebastian-philipp:octopus-backport-35374-35667-36225-35839-36239-36301-36262-36012-36285-36235-36217-3572
Aug 10, 2020
Merged

octopus: cephadm batch backport August (1)#36450
sebastian-philipp merged 45 commits intoceph:octopusfrom
sebastian-philipp:octopus-backport-35374-35667-36225-35839-36239-36301-36262-36012-36285-36235-36217-3572

Conversation

@sebastian-philipp
Copy link
Contributor

@sebastian-philipp sebastian-philipp commented Aug 4, 2020

Backport of #35374, #35667, #36225, #35839, #36239, #36301, #36262, #36012, #36285, #36235, #36217, #35728, #36232, #36162, #36334, #36335, #36286, #36374, #36284, #36338, #36151, #36360, #36348, #36407, #36356, #36386, #36375, #36383, #36388, #36391, #36441, #36433

Conflicts:

commit 19df5b7
mgr/cephadm: Introduce tox and autopep8
Conflicts:
src/pybind/mgr/tox.ini


commit 2d3a544
mgr/osd_support: remove module and all traces
Conflicts:
src/mon/MgrMonitor.cc


commit ed0fa3c
cephadm: use src/mypy.ini instead
Conflicts:
src/cephadm/tox.ini


commit 7cbaadf
mgr/cephadm: rework --dry-run/previews
Conflicts:
src/pybind/mgr/orchestrator/module.py

Joshua Schmid and others added 15 commits August 4, 2020 16:12
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit edbb4f2)
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 917e043)
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit d348d7b)

Conflicts:
	src/pybind/mgr/orchestrator/module.py
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit a8e21a1)
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit 7f5244f)
service_id is required for iscsi, mds, nfs, osd, rgw.

any other service_type (mon, mgr, etc.) should not contain a service_id

Fixes: https://tracker.ceph.com/issues/46175
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit eecc8fc)
example for deploying multiple specs via yaml was missing the service_id

Fixes: https://tracker.ceph.com/issues/46377
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 7906460)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 031365d)
Should speedup day 1 OSD creation by something like factor 10

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit bd356ba)
Fixes: https://tracker.ceph.com/issues/45858

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 1125a80)
Fixes: d348d7b
Fixes: https://tracker.ceph.com/issues/46681

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 6e8f40e)
Add option to use custom authenticated registry during
bootstrap as well as a registry-login command in order
to let user change authenticated registry login info

Fixes: https://tracker.ceph.com/issues/44886
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit a63b030)
Made `orch.Completion` a generic type

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 2310d7f)
Currently when we deploy ceph-iscsi via cephadm it doesn't include a
running tcmu-runner. Which means initiators will be able to login but
you wont see the LUNS on the initiator.

This patch deploys an additional tcmu-runner container along side the
ceph-iscsi container that just runs the tcmu-runner service.

Fixes: https://tracker.ceph.com/issues/46540
Signed-off-by: Matthew Oliver <moliver@suse.com>
(cherry picked from commit eb604d3)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 148ca82)

Conflicts:
	src/cephadm/tox.ini
mgfritch and others added 8 commits August 4, 2020 16:21
add errno to OrchestratorError and ServiceSpecValidationError exceptions

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 60b99dc)
- return output from the result of the ok_to_stop command
- log ok-to-stop result during all invocations

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 2521a7c)
$ ceph orch host ok-to-stop host1
It is presumed safe to stop host host1

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit d6fa2e2)
cephadm will create realm, zonegroup, and zone if needed before creating rgw service

fixes: https://tracker.ceph.com/issues/43681
Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
(cherry picked from commit 131001c)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit a108612)
set the mon public_network when deploying with the cephadm flag

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 6442662)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 537412c)
Having an in-memeory list doesn't work properly: Especially
when loading the mgr module, we didn't knwo if we should
deploy confs or not.

Now we only distribute ceph.confs, if there is a new mon_map.
We also store that info now in the config store

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit aa4c3b2)
Joshua Schmid and others added 14 commits August 4, 2020 16:21
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit a55c1dd)

Conflicts:
	src/mon/MgrMonitor.cc
Fixes: https://tracker.ceph.com/issues/44548
Fixes: https://tracker.ceph.com/issues/45594

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit a0f68c4)
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit e78f5c8)
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 9606f4d)
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 8ff2824)
When we pass in a mon-ip that is ipv6 we want it wrapped, this is so it
can be properly inserted into the mon_addrv address.
But there are times we need to unwrap it to test it's a valid ipv6
address.

This patch adds a helper method `unwrap_ipv6` which takes a string and
returns it either unwrapped or as it is, so it's harmless to other types
of ips.

This allows us to check a wrapped ipv6 base_ip with the networks on the
host.

Signed-off-by: Matthew Oliver <moliver@suse.com>
(cherry picked from commit 13d3bad)
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 4b8384f)
Fixes: https://tracker.ceph.com/issues/46814
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit e401946)
This PR introduces tox and autopep8 to format the Python code according to PEP8. It does NOT include any lint related things.

Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit 7d8a3b6)

Conflicts:
	src/pybind/mgr/tox.ini
* track dependency for running tox tests with tox.ini. the fix
  test is not performed by "make check", so `install-deps.sh`
  is not responsible for preparing the autopep8 wheels. hence
  we can just put it in tox.ini
* remove "python_version >= '3'" as we do not support python2

this change addresses a regression introduced by
7d8a3b6, which fails the rpmbuild like:

RPM build errors:
    Installed (but unpackaged) file(s) found:
   /usr/share/ceph/mgr/requirements-fix.txt

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit a196672)
unimplemented format types can cause the mgr to hang:
$ ceph orch ls --format xml

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit b7eaefa)
Fixes: https://tracker.ceph.com/issues/46045
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit 95a66fe)
We need to force setting registry auth options because
these options are unknown before the mgr first starts
and registers them.

Fixes: https://tracker.ceph.com/issues/46777

Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit 6f8aa25)
when applying a placement of '1' for mon, mgr, rbd-mirror, crash, alertmanager, grafana, node-exporter, prometheus, or mds a dry-run was activated

Fixes: https://tracker.ceph.com/issues/46819
Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
(cherry picked from commit 9f7c8f7)
@sebastian-philipp sebastian-philipp force-pushed the octopus-backport-35374-35667-36225-35839-36239-36301-36262-36012-36285-36235-36217-3572 branch from 52f94d2 to 343a313 Compare August 4, 2020 14:21
@sebastian-philipp
Copy link
Contributor Author

and removed ceph-volume: add drive-group subcommand

@sebastian-philipp sebastian-philipp removed the request for review from a team August 4, 2020 14:22
@sebastian-philipp
Copy link
Contributor Author

Blocked by ceph/ceph-container#1706

@tserong
Copy link
Member

tserong commented Aug 13, 2020

This mentions #35728 in the description, but AFAICT doesn't include the commit from that PR

@jan--f
Copy link
Contributor

jan--f commented Aug 13, 2020

@tserong The backport for this was just merged in #36558

@tserong
Copy link
Member

tserong commented Aug 14, 2020

Thanks @jan--f !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.