mgr/cephadm: update caps if necessary when getting keyring

If the caps change from the old version to the new one it causes
issues in the upgrade. This allows the caps to be updated. Currently
only seeing this with iscsi but changing it for other as a precaution

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 7c0d532f3a4839f4199a13773fb5fa8b6fb3f183)

mgr/cephadm: add cephfs-mirror to CEPH_UPGRADE_ORDER

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit f885072ffa14dcbf74e42ec364867e36aacdd926)

cephadm: Add cephfs-mirror

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

qa/cephadm: Add cephfs-mirror test

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit d4bf7157a13970e417e79469e9db0559d612ebbb)

qa/tasks: some type annotations

Mostly for making my IDE aware of things

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 340281fe76dc1d9170815f68a0553c50fb0b157f)

mgr/orch: Add cephfs-mirror to enum

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit d9d8d717335227a83812acbf33e8fa8bb3383de0)

mgr/cephadm: Add CephfsMirrorService

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit f2f9f51d742c582c08fb590cdaa4d959ee9fb7f5)

mgr/orch: replace def add_{type}(...) with generic add_daemon()

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 175ee8390985ae12b1b67d602338a4d1b1c81b52)

mgr/cephadm: drop `create_func` arg from _add_daemon

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 2465f986680cc489bc82ec2a6f5652b24cdf171b)

mgr/cephadm: move CephadmExporter to new module

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 935a15fd06421786096a37c4bae6571bf6467aec)

mgr/cephadm: fix CephadmExporter deployment

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit c40436e70089322619ed00621354ae46a29ec9d1)

cephadm: exporter: use os.path.realpath(__file__)

Because we now always have a script on the remote hosts.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 470d79bee5101e7d4c11378450591f55e6ede4cc)

mgr/cephadm: root mode: call (and deploy) cephadm binary

Avoid copying cephadm all the time.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit e7a8fac550aed5da9dbf4ef633602d3634c20da6)

cephadm: Get rid of injected_argv

Removed the injected_argv parameter and the injection of code in the cephadm
script we send to hosts.
Now the script is copied and after that we execute the cephadm command.
I would like to copy it only one time (when adding new hosts) but this will be
part of a future PR, together with other prs to:

- Introduce cephadm version
- Get rid of packaged/root mode
- Use pex or eggs

Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 2142dcfc2bac3159b7a24f92ae75df2a14599377)

cephadm: Make path to cephadm binary unique

right now, an upgrade might overwrite the existing
binary which would force us to have the CLI stable.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 8f05520d03c9fb9d57a0d7ed674d4d9dba8d699c)

python-common: continue to allow RGWSpec(realm=r,zone=z)

This is for backward compatibility: an octopus spec yaml can still be
applied to an existing cluster.  Note that it might not work on a new
cluster, since cephadm no longer tries to create the realm or zone if
they don't exist.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit cca7391f54b724730ea091669627731bc74f3519)

PendingReleaseNodes: note changes in cephadm rgw behavior

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit f4ff70941fa585e14cdc628f913b001c208a3327)

qa/tasks/cephadm: drop realm.zone convention for rgw

Note that cephadm.py will no longer do anything with rgw realms and
zones.  That means that the setup of rgw roles here is only useful
for the default zone and a non-multisite config.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 1bfb0cd84b86e23896a967214a3fa89941addd27)

doc: update docs

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 50bc4913735e684c7f0b7feda9444b38fc96588a)

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>
(cherry picked from commit c01112189377e17966fb342262b2f0e16121c882)

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>
(cherry picked from commit 2a47caff720424c895724b7927139f9fbe3d3fee)

doc/cephadm: add prompts to adoption.rst

This PR formats the bash prompts. It also formats the
bash output so that it appears in the correct (easily
copy-and-pasteable) format. This PR will be followed by
a grammar-improving PR, but this PR is just a
formatting PR.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 7eb65fe2cfa5fe78f40f7978191848a7a2a49a71)

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.

(cherry picked from commit a445653511b07af360bda37175eadf2870e053f7)

python-common/ceph/deployment: RGWSpec: accept (and drop) subcluster arg

This is just so we can load up a stored spec after upgrade.  We'll silently
drop it, since we have the service_id, and this was only used to generate
that anyway.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit d35e1d791bedd8d2ed48a456fd1f5bba978f7f37)

mgr/orchestrator: drop $realm.$zone naming convention

- Let users name the rgw service(s) whatever they like
- Make the rgw_zone and rgw_realm arguments optional, so that they can
  omit them and let radosgw start up in the generic single-cluster
  configuration (whichk, notably, has no realm).
- Continue to set the rgw_realm and rgw_zone options for the daemon(s),
  but only when those values are specified.
- Adjust the CLI accordingly.  Drop the subcluster argument, which was
  only used to generate a service_id.
- Adjust rook. This is actually a simplification and improved mapping onto
  the rook CRD, *except* that for octopus we enforced the realm.zone
  naming *and* realm==zone.  I doubt a single user actually did this
  so it is not be worth dealing with, but we need a special case for
  where there is a . in the service name.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit af0216d93fb522d239b10b5d7d18208ee02fed77)

# Conflicts:
# src/pybind/mgr/rook/rook_cluster.py
  - pacific branch does not have type annotation on apply_objectstore()

mgr/cephadm: rgw: do not mess with realm configuration

It is simpler to consider this out of scope for the orchestrator.  The
user should set up their multisite realms/zones before deploying the
daemons (or the daemons will not start).  In the future we can wrap this
with a more friendly tool, perhaps.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 4498f7dc204cada316ba0ea73ca9954d23c437d2)

mgr/cephadm:Document the cephadm config-check feature

This patch updates the docs to describe the config-check feature,
describing how these checks can be enabled and managed.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit e407c6343d419b7003d143c213fdf3f69462cd83)

mgr/cephadm:fix to resolve mypy issue

Build of ceph metadata needed addition type hints.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 14074887db099c7b9b4cf89ccad10f224453696c)

mgr/cephadm:add unit test for the lookup_check helper

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit c29e6ac3dc6df27dfb777588690d8b6a21a27a6d)

mgr/cephadm:Drop active healthcheck during a disable request

The healthcheck could already be active when the admin attempts
to disable it. This patch removes the related healthcheck if it's set
during a config-check disable request.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit f3cf41f98955a2c3b8c31374981e5ecbf5d4eda9)

mgr/cephadm:Added helper function to return a specific healthcheck

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit baa2c9313ade4dcd40e5b42e367ab4c0f8d4b9d9)

mgr/cephadm:unit test added for nics better than most

checks that we're not raising a healthcheck for a host if it's
nic speed it better than the rest!

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 0d7ecb18e33b05bb957f4da7c43199086c7d8ab9)

mgr/cephadm:skip an alert if the linkspeed is better than most

The logic was issuing a healthcheck if the linkspeed was different
to the majority. But if the difference is good (i.e. better!) we should
not be raising a healthcheck

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 74a3599a83b5b1dde094721f7754d284e8acf8fa)

mgr/cephadm:fix mypy warning

Since switching how the roles for a host are determining the
type hint was missed..this patch addresses that

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 83f531239b8d2e148bfae2eba6f1effab359b4b8)

mgr/cephadm:Remove check from ceph metadata gathering

A check for _ceph_get_server was included for unit testing, but
the tests have been updated to make this obsolete.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit b2f0b6f6d29cbe33bfe200e9fa709284677cd6b9)

mgr/cephadm:Add unit test for hosts without public network NIC

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit d271987a4dc8727f2d90ebcce16bdb3f8c56b6ca)

mgr/cephadm:Minor updates to address review comments

Changes to reflect review comments
- picked up on subscribed = unknown state
- using get_daemon_types() call
- use log.exception more
- changed logic and errors from the public_network check

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit c6ba8bca0ed11b8cd243a88c21e5893ba3c0ba17)

mgr/cephadm:Added CLI interface for the configuration checker

Patch to add CLI commands to show and manage the state of the
configuration checker feature

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 0668ffb36d8ba7fa57d7316fc128e7910ba86968)

mgr/cephadm:Multiple updates related to the addition of the CLI

Some changes needed to support the introduction of the CLI commands
used to manage the cephadm checks. For example, the main Cephadm
check class now interacts with the keystore directly to determine
status, and provides support for commands like ls to list the
check definitions. In addition the main class now handles existing
configuration checks and ensure that the stored state in the keystore
matches the checks defined by the module

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 64d5365273617af0ae6eff04796b475b2c8238a0)

mgr/cephadm:Moved 'ownership' of the checker to cephadm

Initial implementation used the Serve class as the owner of the
configuration checker. This patch moves the checker up to the
cephadm module itself, to make the CLI command logic cleaner

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 9ef3bb373362acb4436d3a6d32e290a713edc26a)

mgr/cephadm:Unit tests updated to account for upgrades

Upgrades may change the config checks, so the tests now validate
that new checks and old bogus checks are handled correctly

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit bf02fb98bb7159baa376010fa6daae0a3ebbddb2)

mgr/cephadm:Updates to CephadmConfigChecks class

Multiple updates to ensure
- mgr health checks are raised correctly
- checks are independent and may be disabled

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 13713b5caaca151f7b45e5ef27eccd028778efd7)

mgr/cephadm:Adds unit tests for the CephadmConfigChecks class

Add unit tests to test suite to verify functionality. The unit tests use
a sample host definition and scale that to simulate a cluster to run
the tests against

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 4b1b136d3e97e39936f3e3bd94e2106dc6e42c73)

mgr/cephadm:add module option to enable configuration checks

Adds config_checks_enabled (bool) option

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit fae0adf4f07d8af0d3cb0b9d0eb4c3da14a2cf78)

mgr/cephadm:added ceph version consistency check

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit bcd6acf4a6ff137d98dbaa28aff4927c1075979f)

mgr/cephadm: added config checker to main serve loop

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 3ea8eaf9b5e0e60edd06da927e3c6f375687dbb1)

mgr/cephadm: adding check logic

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 5a555ba93854bc8cf7cfd7ead23509fa5782374a)

mgr/cephadm: resolve rebase conflicts

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 80a9d71d3cd3add8039a52c2ba3efe4388a5185b)

mgr/cephadm:Document the intergration with libstoragemgmt

Updates the cephadm osd documentation to include details about
including integration with libstoragement - including the potential
hardware issues that may arise.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 3b6f21834128bdb1eb763c5fce351b113963fa66)

mgr/cephadm:Enable cephadm device scan to use LSM

Using libstoragemgmt (LSM) in ceph-volume was disabled by default,
(nov 2020) which meant cephadm's inventory never had a way to
request the LSM data. This patch adds a module option called
'device_enhanced_scan' (bool), that if set will append the
--with-lsm parameter to the ceph-volume inventory call.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 3105fa254b70f0fb56c86eb110580108dcd03509)

mgr/cephadm: prevent traceback when invalid osd id passed to 'orch osd rm stop'

orch osd rm exepcts a str that can be converted to an int passed to it
if the user passed something that cant be converted it shows a traceback
catching the ValueError prevents this traceback.

Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
(cherry picked from commit 6e8adcfee6ef8996badac3167007b6c76e33a2e4)

mgr/cephadm: do not prime service cache on reconfig

Ceph daemon reconfig does not need any daemon state refresh since we don't
do a restart--we just rewrite the ceph.conf.  This also avoids priming
our cache with a 'starting' state when the daemon wasn't touched.

Fixes: https://tracker.ceph.com/issues/49675
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 248cb6a76ff52a4e5b5758b97a0d6cd812d9f9f5)

mgr/cephadm/osd: PEP-8 fix

Otherwise `tox -e fix` will continue to
create this hunk

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit bf9d5cb52e8c7d47ea75f3a6f193fbc198bc08b6)

mgr/cephadm: Activate existing OSDs

Adds `ceph cephadm osd activate`

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

mgr/cephadm: osd: Use _run_cephadm_json()

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 555cada8e554e7ec5707bae0d69336af9fe4ae51)

mgr/cephadm: document ok_to_stop output argument for clarity

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 2a1c3997cdb3c046bf8db2b257e28b4cb56abfeb)

mgr/DaemonServer: make warning language a bit friendlier

This message is shown during the upgrade process.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit fb778a3205801a49e4f9c4d3bd24e07dfb410a44)

mgr/cephadm/upgrade: improve language a bit

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit bae8394c5e35b52b2cfaabfe79148a490efdf2dc)

mgr/cephadm/upgrade: restart multiple osds at once

Restart multiple osds in a single upgrade pass, when possible.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit b3d0420e60bcaede1d253bd551f201e756cc3d9a)

mgr/cephadm: gather other osds that are safe to stop

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 075d6fc18858bb552ed1a020d7971578680c4104)

mgr/cephadm: optional pass 'known' through to ok_to_stop

Optionally provide a list of previously known-to-be-ok-to-stop items to
the ok_to_stop method. This has to get plumbed through a zillion instances
of this class method.

No functional change (yet).

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit d9da769079a6a78efd1016af28e7bcf0b8ab830c)

mgr/cephadm/upgrade: log start/stop/pause/resume

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 94b190d4a567ed65ece8aa1981f3aeaa59a292e7)

mgr/cephadm: add CEPHADM_STRAY_DAEMON unittest

Fixes: https://tracker.ceph.com/issues/49573
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 88dc55266958d77ffa1da34a3d20c039cb249ac5)

mgr/cephadm: alias rgw-nfs -> nfs

RGW will register a daemon_type `rgw-nfs` which needs to map to
the corresponding cephadm nfs daemon to avoid stray daemon warnings

Fixes: https://tracker.ceph.com/issues/49573
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 0f237223accbea49cf9792400a657cbf696a5d67)

qa/tasks/cephadm: remove mirror code

This is being done from ansible now.  Also, it breaks when
the conf file has unqualified-search-registries but not 'registry'
entries.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 208407c5c05e29c33d9decdba9455bdc2fe32e90)

cephadm: fixup `alrady` -> `already`

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit d6323e3e01208967a511c246337cfef18cbf141e)

cephadm: Change outer quotes to avoid escaping inner quotes (Q003)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 55788a0bdb1220d2b2df758579366030c8e27947)

cephadm: Remove bad quotes from multiline string (Q001)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 3b8656d496237651971332ccc29f40baad6883ee)

cephadm: Remove bad quotes (Q000)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 6ca31b99e14f4c5518ad348b0b30392f108f5a6a)

# Conflicts:
# src/cephadm/cephadm
  - some ' quotes were already in pacific

cephadm: introduce flake8-quotes

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 49f25f56ae44b2b8d185e866d75cb7a5041c8dcc)

cephadm: line break after binary operator (W504)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 7ac0479726b5d9ae925faff3c221f50e39547dd2)

cephadm: blank line contains whitespace (W293)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 06e02b73c7c1ec20d6594cdc792c5643cdd06b5f)

# Conflicts:
# src/cephadm/cephadm
 whitespace

cephadm: trailing whitespace (W291)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 1870056fa50c833d9ab545a35437013bf4bea74a)

# Conflicts:
# src/cephadm/cephadm
  - whitespace

Signed-off-by: Sage Weil <sage@newdream.net>

cephadm: local variable 'e' is assigned to but never used (F841)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit ec56db113f28d59cf5baf833be2a77aa8eeb5863)

cephadm: 'select' imported but unused (F401)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit bb0331841408cbcf7c1835974cdb77694d56fdc6)

cephadm: ambiguous variable name 'l' (E741)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit c58701642dad678f6cf3ff946b10fc2a78b053c0)

cephadm: do not use bare 'except' (E722)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 8eb4c38f10251386b190194dd12f2787b083e383)

cephadm: statement ends with a semicolon (E703)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 6237df7527b0384b2c1d47d17369e58cf9c5b0a4)

cephadm: module level import not at top of file (E402)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 9bbb35958cca8f8f72da324aa35f4d631e8c31a4)

# Conflicts:
# src/cephadm/cephadm
  - top definitions moved; kept pacific and is_master=False in place

cephadm: expected 1 blank line before a nested definition (E306)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 6c8ea9fb65cb63db0aac4d53d507e21a0f85d726)

cephadm: expected 2 blank lines after end of function or class (E305)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit cf9e974284e34cc71438cf9ce0eac19e77e911b8)

cephadm: too many blank lines (E303)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit f1af846c60598b573697ba2c55266ae88087227b)

cephadm: expected 2 blank lines, found 1 (E302)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit dea779803445cc83fa0a63570d0068f572ccbd20)

# Conflicts:
# src/cephadm/cephadm
  - whitespace

cephadm: expected 1 blank line, found 0 (E301)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 858b55c3acd0380565c7a2f565614d2ac61a3d13)

cephadm: too many leading '#' for block comment (E266)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 3dcb56e3e31d11041a48c2749bb248240bb14134)

# Conflicts:
# src/cephadm/cephadm
  - whitespacea roudn comment

cephadm: block comment should start with '# ' (E265)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 20c5f3d186f606ec4a5b66b6edd3f3c0056a8a27)

cephadm: at least two spaces before inline comment (E261)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 6d937393f872a484d1a4c80a72b327b7280278e3)

cephadm: unexpected spaces around keyword / parameter equals (E251)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit d47b26d792cfff7c64c78e781e7e38494f9a4c85)

cephadm: multiple spaces after ',' (E241)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit d2bb74a8964ecb0f995874335e20a7f2fda1b3f1)

cephadm: missing whitespace after ':' (E231)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 3e3ace6f31ce5758dc56150f762f9d2e2ca41301)

cephadm: missing whitespace around arithmetic operator (E226)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 549258b4c6fe3945acdd03eeedab5070d1d81d01)

cephadm: missing whitespace around operator (E225)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 2af78e9358838d04c9b92ee76736de53466a11f6)

# Conflicts:
# src/cephadm/cephadm
 - whitespace mismatch

cephadm: whitespace before ':' (E203)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit f2f76a25179743f46bd9981d141fc8277799addd)

cephadm: whitespace after '{' (E201)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 9e4fd38f32e8a972d64eda66a2a8623ea8bde179)

cephadm: continuation line unaligned for hanging indent (E131)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 5ba2b30f788aa5001e0ec6a5fb168be5e8b59bad)

cephadm: continuation line under-indented for visual indent (E128)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 4611df9669f1ec78d62fcb8c2b475d2e4c3467d3)

cephadm: continuation line over-indented for visual indent (E127)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 460e6e84aa433559ae63fb0f13fb1e9d0df82385)

cephadm: continuation line over-indented for hanging indent (E126)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit fa2b17c8ecffb1c91c3e9f34ff0e7eea0f09ba3b)

# Conflicts:
# src/cephadm/cephadm
 - master has trailing whitespace; pacific did not

cephadm: continuation line with same indent as next logical line (E125)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 0d57f5496e0b4b486e4c723d150f789b58c960e7)

cephadm: closing bracket does not match visual indentation (E124)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 91b54fcabcdac2c6ce7af8a934a5292cf252d608)