cephadm: apply autopep8 changes

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

cephadm: introduce autopep8

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

cephadm: remove `verify-prereqs` subcommand

sysctl settings are now managed per-host, rather than per-daemon

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

cephadm: add HAProxy sysctl settings

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

cephadm: move keepalived sysctl settings

from container pre-start to sysctl file

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

cephadm: apply osd sysctl settings

These were added to ceph-salt (ceph/ceph-salt@800dbb2)
.. but let's make them available to all consumers of cephadm!

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

mgr/cephadm: warn users if they try to pass a daemon to 'orch rm'

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

qa/suites/orch/rook: disable centos for now

We are hitting an selinux denial:

type=AVC msg=audit(1621353663.595:6016): avc: denied { write } for pid=28812 comm="cephcsi" name="pids.max" dev="cgroup" ino=2933 scontext=system_u:system_r:container_t:s0:c43,c177 tcontext=system_u:object_r:cgroup_t:s0 tclass=file permissive=1

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

qa/suites/orch/rook/smoke: initial smoke suite

- os: 18.04, 20.04, centos, centos+kubic
- nodes: 1 or 3
- rook: 1.6.2 or master
- k8s: 1.21 always (for now)
- net: calico always (flannel + centos is wonky)
- workload: none, rados bench

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

qa/tasks/rook: ROOK_HOSTPATH_REQUIRES_PRIVILEGED=true on centos

This fixes OSD creation on centos.

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

qa/tasks/rook: simplify shutdown

For some reason deleting common.yaml sometimes fails.  Not really
sure why, but since we will tear down kubernetes anyway this
cleanup isn't really needed.

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

qa/tasks/rook: archive logs

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

qa/tasks/rook: more orderly cluster teardown

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

qa/tasks/rook: deploy ceph via rook on top of kubernetes

This assumes that k8s is installed and kubectl works.

The ceph container to use is selected the same way the cephadm
task does it.

All scratch devices are consumed as OSDs.

A ceph.conf and client.admin keyring are deployed on all test
nodes, so normal tasks should work (if/when packages are installed).

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

qa/tasks/kubeadm: install kubernetes with kubeadm

- install k8s with kubeadm
- initial support for flannel only
- remove taint from bootstrap/master node
- create PVs for all scratch_devs + a 'scratch' SC
- kubeadm.kubectl task

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

qa/suites: move rados/cephadm -> orch/cephadm; symlink

Move cephadm under orch/ top-level suite.  Symlink so that we
still include it in a rados run.

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

# Conflicts:
# qa/suites/rados/cephadm
 - included thrash-old-clients, which is different in master

qa/tasks/cephadm: add whitespace between functions

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

qa/tasks/cephadm: clean up ctx.manager setup

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

mgr/cephadm: pin haproxy image to 2.3.z

The 2.4 version fails for reasons that aren't immediate clear:

May 17 15:28:42 dael conmon[3007013]: [NOTICE]   (8) : haproxy version is 2.4.0-6cbbecf
May 17 15:28:42 dael conmon[3007013]: [NOTICE]   (8) : path to executable is /usr/local/sbin/haproxy
May 17 15:28:42 dael conmon[3007013]: [ALERT]    (8) : Cannot open configuration file/directory /var/lib/haproxy/haproxy.cfg : Permission denied

Even with mode 777 on those files, there is an error about the chroot to
/var/lib/haproxy.

For now, just stick with a working version.

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

mgr/cephadm: fix issue with missing prometheus alerts

Files passed as configuration to the cephadm binary had not been created
and mapped to the container, if those files weren't included in the
required files section inside cephadm. This prevented optional file
includes in the configuration.

The configuration file for the Prometheus default alerts is not
mandatory and hence wasn't included in the required files section, still it
needs to be added to the container by cephadm.

This change enables optional files to be included in the configuration
for monitoring components, so that those files are created and mapped
within the container.

Note that a `required_files` variable has been removed at one position
in these changes, though it wasn't used to ensure that required files
were included in the configuration at that point anyway. The test which
ensures that all required files are passed is somewhere else.

Fixes: https://tracker.ceph.com/issues/49856
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 38f9846d13ae2c5f12bde3397d2826b1cf43759b)

mgr/cephadm: check version in upgrade check

Fixes: https://tracker.ceph.com/issues/50784
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit e1979fb5bda09d7028d53a64b36cca5206e9e3a4)

mgr/cephadm: Fix OSD replacement in hosts with FQDN host name

Resolves: https://tracker.ceph.com/issues/50805

Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
(cherry picked from commit b1feb876d3bbe8798be062c61d523dde09d281d7)

mgr/cephadm: fix prometheus jinja template

The prometheus yaml file shouldn't use "tab" character but only spaces.

Fixes: https://tracker.ceph.com/issues/50717
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 2d8995e1ded22e680f778c4ef73ddd86592df21c)

doc/cephadm: rewrite "disabling monitoring"

* Simplified the text.
* Correctly formatted the prompts.

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

mgr/cephadm: induce retune of osd memory on osd creation

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

qa/tasks/cephadm.conf: autotune osd memory by default

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

mgr/cephadm: do not autotune when _no_autotune_memory label is present

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

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

common/options: add osd_memory_target_autotune

This does not cherry-pick 6029a0e256cb10a8c35b3bbdc9a22ad679e6fe03
because options.cc is autogenerated in master branch.

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

mgr/cephadm: report memory usage, request (limit) in 'orch ps'

Fill in from {osd,mon}_memory_target if no container limit is set.

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

doc/cephadm/host-management: document _admin group

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

mgr/orchestrator: fix help formatting

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

mgr/cephadm/schedule: fix filter message

This is now only used when scheduling mons.  (Units now enable the kernel
features needed instead of checking for them during placement.)  Move the
message to the filter itself.

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

mgr/cephadm: Use `cephfs-mirror` caps profile

The profile is required to establish a peer
connection, but was added after this got merged

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit f95ded3f902d383c166dfde9bd178f5bc9563036)

Merge pull request #41122 from idryomov/wip-rbd-nuke-source-spec-file-pacific

pacific: rbd: --source-spec-file should be --source-spec-path

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Sunny Kumar <sunkumar@redhat.com>

Merge pull request #41005 from mgfritch/pacific-backport-40411

pacific: mgr/volumes/nfs: drop type param during cluster create

Reviewed-by: Varsha Rao <varao@redhat.com>

Merge pull request #40996 from batrick/i50258

pacific: qa: convert some legacy Filesystem.rados calls

Reviewed-by: Milind Changire <mchangir@redhat.com>

Merge pull request #40855 from batrick/i50254

pacific: mds: standby-replay only trims cache when it reaches the end of the replay log

Reviewed-by: Milind Changire <mchangir@redhat.com>

Merge pull request #40685 from singuliere/wip-50183-pacific

pacific: client: fix the opened inodes counter increasing

Reviewed-by: Milind Changire <mchangir@redhat.com>

Merge pull request #41402 from rhcs-dashboard/wip-50881-pacific

pacific: mgr/dashboard: update frontend deps due to security vulnerabilities

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

mgr/dashboard: update frontend deps due to security vulnerabilities.

Fixes: https://tracker.ceph.com/issues/50800
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit 7ee75880c1c600a25f05f98c280be87758579901)

Conflicts:
  - src/pybind/mgr/dashboard/frontend/package-lock.json
    Resolved conflicts.

mgr/dashboard: get SASS vars values in TS through CssHelper.

Now SASS vendor variables' values can be retrieved by var name via CssHelper.

We were relying on the angular webpack config that has changed in the latest v10.x and v11.
See: https://github.com/angular/angular-cli/issues/19622#issuecomment-744395101

Fixes: https://tracker.ceph.com/issues/50800
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit 7310e15a9bb704c3b214b9b5373807b1167df009)

Merge pull request #41324 from rhcs-dashboard/wip-50772-pacific

pacific: mgr/dashboard: fix OSDs Host details/overview grafana graphs

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: wornet-mwo <NOT@FOUND>

Merge pull request #41200 from votdev/wip-50662-pacific

pacific: mgr/dashboard: disable NFSv3 support in dashboard

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #41298 from rhcs-dashboard/wip-50543-pacific

pacific: mgr/dashboard: fix HAProxy (now called ingress)

Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

Merge pull request #41296 from rhcs-dashboard/wip-50769-pacific

pacific:  mgr/dashboard: RGW buckets async validator performance enhancement and name constraints

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

Merge pull request #41136 from ideepika/wip-pacific-40572

pacific: qa/config/rados: add dispatch delay testing params

Reviewed-by: Neha Ojha <nojha@redhat.com>

mgr/dashboard: add Services e2e tests

Fixes: https://tracker.ceph.com/issues/50567
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Introducing e2e tests for service creation for Ingress and RGW service types.

mgr/dashboard: disable NFSv3 support in dashboard

Fixes: https://tracker.ceph.com/issues/49718
Related to: https://github.com/ceph/ceph/pull/40154

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

Merge remote-tracking branch 'origin/pacific-saved' into pacific

16.2.4

mgr/dashboard: fix cookie injection issue

Fixes: CVE-2021-3509
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit b39922818bc57cde1b016e9ad41908b18063b93b)

systemd: remove `ProtectClock=true` for `ceph-osd@.service`

Ceph 16.2.0 Pacific by https://github.com/ceph/ceph/commit/9a84d5a introduce following new systemd restriction:

    ProtectClock=true
    ProtectHostname=true
    ProtectKernelLogs=true
    RestrictSUIDSGID=true

BTW, `ceph-osd@.service` failed with `ProtectClock=true` unexpectly, also see:

  - <https://lists.ceph.io/hyperkitty/list/ceph-users@ceph.io/thread/TNBGGNN6STGDKARAQTQCIPTU4KLIVJQV/>
  - <https://serverfault.com/questions/1059317/bluestore-var-lib-ceph-osd-ceph-2-block-read-bdev-label-failed-to-open-var-l>

This PR intruduce:

  - Remove `ProtectClock=true` for our systemd service templates

Fixes: https://tracker.ceph.com/issues/50347
Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
(cherry picked from commit 85bc551b179d940a50cbdfd0c20848e3187c70a6)

mgr/dashboard: fix set-ssl-certificate{,-key} commands

- Now create-self-signed-cert command relies on set-ssl-certificate{,-key} commands.
- Simplify the command testing and increase the test coverage.

Fixes: https://tracker.ceph.com/issues/50519
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit fb20990bca55ffe1712a905c3a9741e8df004e74)
(cherry picked from commit 3bdbbb95a05b26e84e09a550d0bde3facf3a76d4)

mgr/dashboard: fix base-href: revert it to previous approach

Fixes: https://tracker.ceph.com/issues/50684
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit b6f92922f5c80223fd288d98ce85405a650c0135)
(cherry picked from commit 6b9c8ca076ef63df64ee12f89132ed2f46c4b739)

mgr/dashboard: fix OSDs Host details/overview grafana graphs

Fixes: https://tracker.ceph.com/issues/50686
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit 7d79efb0252e970b3621d1540e69e2115788dcc3)

dashboard: Fixed name clash when hostname similar to anaother

Fixes: #49769
Signed-off-by: Michael Wodniok <wodniok@wor.net>
(cherry picked from commit e97e27ebdbb394c01aa1cf502039a798d9c4e110)

Merge pull request #41313 from ceph/wip-yuriw-p2p-pacific

pacific: qa/tests: corrected point versions to reflect latest releases

Reviewed-by: Neha Ojha <nojha@redhat.com>

qa/tests: corrected point versions to reflect latest releases

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

Merge pull request #41208 from ceph/wip-yuriw-p2p-pacific2

pacific: qa/tests: initial checkin for pacific-p2p suite (2)

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #41079 from tchaikov/pacific-rocksdb

pacific: rocksdb: pickup fix to detect PMULL instruction

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #41232 from neha-ojha/wip-50381-pacific

pacific: systemd: remove `ProtectClock=true` for `ceph-osd@.service`

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge PR #41182 into pacific

* refs/pull/41182/head:
ceph_test_rados_api_service: stop threads before asserting
ceph_test_rados_api_service: more retries for servicemkap

Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge PR #40729 into pacific

* refs/pull/40729/head:
qa/distros/podman: preserve registries.conf

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge PR #41219 into pacific

* refs/pull/41219/head:
mgr/cephadm: misc. autopep8 changes
mgr/cephadm: add timeout when removing iscsi gateway.conf
mgr/cephadm: mock subprocess calls in tests that remove iscsi daemons
qa/tasks/cephadm_cases: longer wait for osd to start
mgr/cephadm: apply hostname/addr checks to 'orch host set-addr' too
mgr/cephadm: make 'host add' idempotent
mgr/cephadm: set host crush location based on HostSpec
python-common: add location property to HostSpec, + tests
doc/cephadm: rewriting "starting the upgrade"
doc/cephadm: rewrite "monitoring the upgrade"
doc/cephadm: rewrite "cancelling the upgrade"
doc/cephadm: rewrite "potential problems"
doc/cephadm: rewrite "using customized con..."
Add Rocky Linux to supported DISTRO_NAMES
mgr/cephadm: remove haproxy+keepalived container image from service spec
mgr/cephadm:  extend disk selector test which disk size may be decimal
mgr/cephadm: When device size contains the decimal, it can not match size exactly.
mgr/dashboard: fix HAProxy (now called ingress)
mgr/cephadm: Purge iscsi configuration from pool and ceph config

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge pull request #40813 from rhcs-dashboard/wip-50034-pacific

pacific: build(deps): bump node-notifier from 8.0.0 to 8.0.1 in /src/pybind/mgr/dashboard/frontend

Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

mgr/dashboard: Detailed error messages in rgw bucket name validation

Explain the rgw bucket name constrains for each bucket name validation
errors.

Fixes: https://tracker.ceph.com/issues/50516
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit ab04e536684024c8d3613907d4bcd72fddf2ef20)

mgr/dashboard: RGW buckets async validator performance enhancement

The rgw bucket creation form has the Name field which have an async
validator. The validator calls all the bucket name and check if the
entered name is unique or not. This happens on every keystroke. So if
100 or more buckets are there, then the async validation can be real
    slow and causes misvalidations in different fields.

I changed the validation logic and did some cleanups to improve the
performance of the async validation.

Fixes: https://tracker.ceph.com/issues/50514
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 005327c4e12fef8d7054894d9df021c0b3c53e19)

Merge pull request #40982 from rhcs-dashboard/wip-50427-pacific

pacific: mgr/Dashboard: Remove erroneous elements in hosts-overview Grafana dashboard

Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>

Merge pull request #41259 from petrutlucian94/wip-50726-pacific

pacific: Update boost url, fixing windows build

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #40484 from gregsfortytwo/wip-stretch-mon-location-pacific-base

pacific: Improve mon location handling for stretch clusters

Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #41203 from rhcs-dashboard/wip-50680-pacific

pacific: mgr/dashboard: avoid data processing in crush-map component

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

Merge pull request #41197 from rhcs-dashboard/wip-50674-pacific

pacific: mgr/dashboard: fix bucket versioning when locking is enabled

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

rgw: sanitize \r in s3 CORSConfiguration's ExposeHeader

follows up on 1524d3c0c5cb11775313ea1e2bb36a93257947f2 to escape \r as
well

Fixes: CVE-2021-3524
Reported-by: Sergey Bobrov <Sergey.Bobrov@kaspersky.com>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 87806f48e7a1b8891eb90711f1cedd26f1119aac)

rgw: RGWSwiftWebsiteHandler::is_web_dir checks empty subdir_name

checking for empty name avoids later assertion in RGWObjectCtx::set_atomic

Fixes: CVE-2021-3531
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 7196a469b4470f3c8628489df9a41ec8b00a5610)

Merge pull request #41251 from rhcs-dashboard/wip-50723-pacific

pacific: mgr/dashboard: fix base-href: revert it to previous approach

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

Merge pull request #40054 from alimaredia/wip-rgw-dpp-pacific

Pacific: Add DoutPrefixProvider for RGW Log Messages in Pacfic

Reviewed-by: Casey Bodley <cbodley@redhat.com>

win*.sh,cmake: Fix Windows linking errors

The Windows build is hitting linking errors after
bumping the Boost version to 1.75. The issue is that Boost
is now setting the zlib dependecy using INTERFACE_LINK_LIBRARIES,
which means that it's no longer located using the standard
"find_package" mechanism.

In order for the linker to locate zlib, we'll add it to the
linker search path.

[1] https://github.com/boostorg/boost_install/issues/47

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
(cherry picked from commit 0af38d179e48a48354a863e2b7f6478ecd5db318)

win32*.sh: ensure that the build dir exists

The Windows build scripts try to use the build dir before
actually creating it.

We'll have to move up the "mkdir" command a few lines.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
(cherry picked from commit c6404e15cb2cde046224433403349e7437f3044e)

win32*.sh: bump boost version to 1.75

We're updating the Windows build scripts to use Boost 1.75, the same
as the Linux build.

We can now drop the custom Boost patches that were needed in order
to use mingw. Those have been merged upstream in the meantime.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
(cherry picked from commit b683c55283f79fef2de349d08736fe1781e8f6b0)

win32*.sh: improve logging

We'll use a log file when building the Ceph dependencies. Also, we'll
log some details about the operation that's about to be performed.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
(cherry picked from commit 9cad7db13a1176ac3b3fee89983d6d21420f5429)

win32*.sh: fix boost url

The boost download location has changed, breaking the Windows build.
Ths commit updates the boost download url.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
(cherry picked from commit f1a8044f1da0f7171ee189b1c0c5f1e519694777)

mgr/dashboard: fix base-href: revert it to previous approach

Fixes: https://tracker.ceph.com/issues/50684
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit b6f92922f5c80223fd288d98ce85405a650c0135)

systemd: remove `ProtectClock=true` for `ceph-osd@.service`

Ceph 16.2.0 Pacific by https://github.com/ceph/ceph/commit/9a84d5a introduce following new systemd restriction:

    ProtectClock=true
    ProtectHostname=true
    ProtectKernelLogs=true
    RestrictSUIDSGID=true

BTW, `ceph-osd@.service` failed with `ProtectClock=true` unexpectly, also see:

  - <https://lists.ceph.io/hyperkitty/list/ceph-users@ceph.io/thread/TNBGGNN6STGDKARAQTQCIPTU4KLIVJQV/>
  - <https://serverfault.com/questions/1059317/bluestore-var-lib-ceph-osd-ceph-2-block-read-bdev-label-failed-to-open-var-l>

This PR intruduce:

  - Remove `ProtectClock=true` for our systemd service templates

Fixes: https://tracker.ceph.com/issues/50347
Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
(cherry picked from commit 85bc551b179d940a50cbdfd0c20848e3187c70a6)

Merge pull request #41212 from neha-ojha/wip-41211-pacific

pacific: qa/suites/rados/standalone: remove mon_election symlink

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

mgr/cephadm: misc. autopep8 changes

Some of the file in mgr/cephadm are getting changed
every time I want to run the mgr tox tests to check
changes and it's inconvenient to have to check the
files out every time

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

mgr/cephadm: add timeout when removing iscsi gateway.conf

We already catch TimeoutExpired exceptions here but we don't
actually specify a timeout

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

mgr/cephadm: mock subprocess calls in tests that remove iscsi daemons

tests that remove iscsi daemons use subprocess.run to make
a call to rados to clear out the gateway.conf. We don't want
the tests to actually make that call.

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

rgw: add DPP's to logging for most ops

This commit contains the following major
changes:

- Most log output lines for major ops now have
DoutPrefixProviders.

- Create new macro ldpp_subdout. This macro is meant
as a replacement for lsubdout for headerfiles that
do not define the rgw subsys.

- Changes to RGWObjManifest begin and end iterators.

- Make it so that rgw_dencoder.cc should only contain the
logic related to encoding.

Also add dpp to ldouts and lderr's already using
req_state and replace sync_env/env->dpp's with dpp's

Signed-off-by: Ali Maredia <amaredia@redhat.com>
Signed-off-by: Kalpesh Pandya <kapandya@redhat.com>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 6cfc2ce2ce669e139acb682898c53c5602075e31)

Merge pull request #41204 from rhcs-dashboard/wip-50652-pacific

pacific: mgr/dashboard: Generate NPM dependencies manifest

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>

qa/tasks/cephadm_cases: longer wait for osd to start

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

mgr/cephadm: apply hostname/addr checks to 'orch host set-addr' too

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

mgr/cephadm: make 'host add' idempotent

Do not let prime_empty_host blow away inventory.

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

mgr/cephadm: set host crush location based on HostSpec

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

python-common: add location property to HostSpec, + tests

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

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

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

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

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

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