ceph-volume tests verify proper formatting of RuntimeError on vg/lv error

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit d7320313a15ad8bb948e501382269c8f33a8cb70)

ceph-volume lvm.prepare correctly format argument for vg/lv error

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 7c0b00615d46a9451cb3a7731594cd7864eabc07)

Merge pull request #19042 from liewegas/wip-22128

mon/OSDMonitor: fix ruleset-* to crush-* fixup

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Merge pull request #19355 from tchaikov/wip-18589-luminous

luminous: build/ops: move ceph-*-tool binaries out of ceph-test subpackage

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>

debian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move

this is a follow-up of #19328. we need to get this change into 12.2.3.
so better off do the switch somewhere after 12.2.2 which has been
tagged, and before 12.2.3, which is not tagged yet.

please note, this is not targetting master, because i want to make
sure the change number (the <num> in << 12.2.2-<num>) is correct. it
does not hurt if it's not, as long as it is ">> 12.2.2", so the replace
machinery in 12.2.3 works, and it covers the releases where the
ceph-{osdomap,kvstore,monstore}-tool are not move yet. but why don't
make it more right?

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 57bb57f76d733d6e6dea4fc0682058e4e6abe7df)

debian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move

The backport didn't make 12.2.2, but it will be in 12.2.3.

Fixes: http://tracker.ceph.com/issues/22319
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit e0c814266fe653311673e07bd7c7dbb51d866f82)

doc: add ceph-kvstore-tool's man

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
(cherry picked from commit 0667db4eb61338887743d17c93a61c0e89868b08)

debian: fix package relationships after d3ac8d18

d3ac8d18 moves ceph-client-debug from ceph-test to ceph-base without
updating the package relationships between the two involved packages.
which results in:

dpkg: error processing archive /var/cache/apt/archives/ceph-test_12.2.1-241-g43e027b-1trusty_amd64.deb (--unpack):
 trying to overwrite '/usr/bin/ceph-client-debug', which is also in package ceph-base 10.2.10-14-gcbaddae-1trusty
dpkg-deb: error: subprocess paste was killed by signal (Broken pipe)

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit ed988fc660c5da3cb97e48e82ac5b7ad8f3bcd41)

debian: fix package relationships after 40caf6a6

we have issues when running upgrade tests:

dpkg: error processing archive /var/cache/apt/archives/ceph-osd_13.0.0-2201-g6cc0b41-1trusty_amd64.deb (--unpack):
trying to overwrite '/usr/bin/ceph-osdomap-tool', which is also in package ceph-test 10.2.10-14-gcbaddae-1trusty

in 40caf6a6, we moves some tools from ceph-test out into ceph-osd,
ceph-mon and ceph-base respectively. but didn't update the relationships
between these packages accordingly. this causes the upgrade failure.

see https://www.debian.org/doc/debian-policy/#document-ch-relationships
for more details on "Breaks" and "Conflicts".

the reason why the package version to be replaced/conflicted is 12.2.2
is that: i assume that this change will be backported to luminous, and
the next release of it will be 12.2.2 .

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 50dad805d9f635f2d8085237e94ee8fd0948dd3c)

build/ops: deb: move ceph-*-tool binaries out of ceph-test subpackage

ceph-osdomap-tool into ceph-osd subpackage
ceph-monstore-tool into ceph-mon subpackage
ceph-kvstore-tool into the ceph-base subpackage

Fixes: http://tracker.ceph.com/issues/21762
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 40caf6a6d85fbde930b74df57a62381f6225c3fd)

build/ops: rpm: move ceph-*-tool binaries out of ceph-test subpackage

ceph-osdomap-tool into ceph-osd subpackage
ceph-monstore-tool into ceph-mon subpackage
ceph-kvstore-tool into the ceph-base subpackage

Fixes: http://tracker.ceph.com/issues/21762
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit d7b493a7108a68302bc0f48337bf3c253a720266)

Merge pull request #19299 from tchaikov/wip-pr-19196-luminous

luminous: ceph-disk: fix signed integer is greater than maximum when call major

Reviewed-by: Alfredo Deza <adeza@redhat.com>

ceph-disk: fix signed integer is greater than maximum when call major
  fix signed integer is greater than maximum when call os.major
  using python 2.7.5 in Centos 7

Signed-off-by: Song Shun <song.shun3@zte.com.cn>
(cherry picked from commit f77934b19939796d7ab52daf4dac44846a2ad162)

Merge remote-tracking branch 'gh/luminous' into luminous

Merge pull request #19001 from tchaikov/wip-pr-18848-luminous

luminous: mgr/dashboard: fix audit log loading

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #19270 from tchaikov/wip-pr-19225-luminous

luminous: qa/suites/rados/singleton: more whitelist

Reviewed-by: Sage Weil <sage@redhat.com>

qa/suites/rados/singleton: more whitelist

* SLOW_OPS is normal in a cluster with flattering OSDs
* so is OBJECT_MISPLACED.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 0e987665fe480530a0d1664392604713828bfa5c)

12.2.2

Merge pull request #19240 from tchaikov/wip-22266-luminous

luminous: tools/ceph_monstore_tool: rebuild initial mgrmap also

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>

Merge pull request #19230 from tchaikov/wip-22247-luminous

luminous: mon/PGMap: Fix %USED calculation

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Merge pull request #19239 from ceph/luminous-bz1518264

luminous: ceph-volume correctly fallback to bluestore when no objectstore is specified

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

tools/ceph_monstore_tool: rebuild initial mgrmap also

Fixes: http://tracker.ceph.com/issues/22266
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit f63d1da4afa3463730ecbc0be29df6375b79fa8f)

ceph-volume lvm.activate correct detection and fallback of objectstore flags

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit f0ac2dfdbc0a05cff0a5edbedca91274885b7870)

ceph-volume tests.devices.lvm verify objectstore flags in activate

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 8d22856d6c95ac3b45918765b382cae507a8d1a4)

Merge pull request #19217 from liewegas/wip-p2p-app-warning-luminous

upgrade/jewel-x/parallel: debug fuse

mon/PGMap: Fix %USED calculation bug.

Previous code forgot to multiple raw_used_ratio to calculate
used byte.

Fixes: http://tracker.ceph.com/issues/22247
Signed-off-by: Xiaoxi Chen <xiaoxchen@ebay.com>
(cherry picked from commit d10c6c26f9ef7372e2c95da79d23b07ce5f4e0e5)

qa/suites/upgrade/jewel-x/point-to-point: whitelist more stuff

Signed-off-by: Sage Weil <sage@redhat.com>

qa/suites/upgrade/jewel-x/parallel: only mount ceph-fuse once

Otherwise we do 4 mounts for no good reason.

Signed-off-by: Sage Weil <sage@redhat.com>

upgrade/jewel-x/parallel: debug fuse

Signed-off-by: Sage Weil <sage@redhat.com>

Merge pull request #19216 from liewegas/wip-p2p-app-warning-luminous

qa/suites/upgrade/jewel-x/point-to-point: fix suppression of pool app warning

qa/suites/upgrade/jewel-x/point-to-point: fix suppression of pool app warning

It's generated on the mgr.

Signed-off-by: Sage Weil <sage@redhat.com>

Merge pull request #19205 from tchaikov/wip-22136-luminous

luminous: qa/ceph-disk: enlarge the simulated SCSI disk

Reviewed-by: Alfredo Deza <adeza@redhat.com>

Merge pull request #19152 from smithfarm/wip-22235-luminous

luminous: ceph-disk flake8 test fails on very old, and very new, versions of flake8

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

qa/ceph-disk: enlarge the simulated SCSI disk

100MB will be allocated for journal, and the remaining 100MB is for data
device. taking the inode into consideration, there will be approximately
87988 kB available for the activated OSD. and it will complain with a
"nearfull" state.

Fixes: http://tracker.ceph.com/issues/22136
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit b3c159e9fb8c31d0acd75f0702080f18959f672e)

Merge pull request #19173 from smithfarm/wip-22251-luminous

luminous: build/ops: macros expanding in spec file comment

Reviewed-by: David Disseldorp <ddiss@suse.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>

Merge pull request #19179 from ceph/wip-yuriw-BP-19175-luminous

qa/suites/rados/rest: move rest_test from qa/suites/rest/

Reviewed-by: Yuri Weinstein <yweins@redhat.com>

qa/suites/rados/rest: move rest_test from qa/suites/rest/

...and add more health whitelists.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit ddb274669ca16b95c452b256e58a2830af10c73d)
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

Merge pull request #19177 from liewegas/wip-jewel-x-p2p

qa/suites/upgrade/jewel-x/point-to-point: skip ec tests when mons may be old

Reviewed-by: Yuri Weinstein <yweins@redhat.com>

qa/suites/upgrade/jewel-x/point-to-point: skip ec tests when mons may be old

Early point release mons don't handle legacy ruleset-* ec profiles, new
ones do.  Skip the ec tests that may trigger this when we are doing a
workload that races with mon upgrades.

Signed-off-by: Sage Weil <sage@redhat.com>

rpm: rm macros in comments

rpm expands all macros in a .spec file, even those in comments. Drop the
percent signs so rpm will not expand these.

This change silences rpmlint's warning about macros in comments.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 5c1e9f55d3a144c93c9c18b031db3cdc320561ef)

tests: ceph-disk: ignore E722 in flake8 test

Very old, and very new, versions of flake8 treat E722 as an error:

flake8 runtests: commands[0] | flake8 --ignore=H105,H405,E127 ceph_disk tests
ceph_disk/main.py:1575:9: E722 do not use bare except'
ceph_disk/main.py:1582:9: E722 do not use bare except'
ceph_disk/main.py:3252:5: E722 do not use bare except'
ceph_disk/main.py:3288:21: E722 do not use bare except'
ceph_disk/main.py:3296:17: E722 do not use bare except'
ceph_disk/main.py:4358:5: E722 do not use bare except'
tests/test_main.py:26:1: E722 do not use bare except'
ERROR: InvocationError: '/opt/j/ws/mkck/src/ceph-disk/.tox/flake8/bin/flake8 --ignore=H105,H405,E127 ceph_disk tests'

Fixes: http://tracker.ceph.com/issues/22207
References: https://gitlab.com/pycqa/flake8/issues/361

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 3600cd7bfdca76485d2998c5da1a0dd25816d1ce)

Merge pull request #19080 from smithfarm/wip-22212-luminous

luminous: tests: ceph-disk: silence deprecation warnings

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

qa/workunits: silence py warnings for ceph-disk tests

ceph-disk now prints "depreacted" warning message when it starts. but
the tests parses its stdout and stderr for a json string. so we need to
silence the warnings for the tests.

Fixes: http://tracker.ceph.com/issues/22154
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit d44334f31704487ec3574738e75145872d9932cf)

qa/suites/upgrade/jewel-x: move mon_warn_on_pool_no_app to global

Check runs on mgr.

Signed-off-by: Sage Weil <sage@redhat.com>

Merge pull request #18989 from ceph/wip-luminous-rm22154

luminous: ceph-disk create deprecation warnings

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

mon/OSDMonitor: fix mon_fixup_legacy_erasure_code_profiles

Signed-off-by: Sage Weil <sage@redhat.com>

Merge pull request #19025 from tchaikov/wip-pr-19024-luminous

luminous: qa/tasks: prolong revive_osd() timeout to 6 min

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #18945 from liewegas/wip-22128

mon/OSDMonitor: add option to fix up ruleset-* to crush-* for ec profiles

Reviewed-by: Joao Eduardo Luis <joao@suse.de>

qa/tasks: prolong revive_osd() timeout to 6 min

see also #17902

Fixes: http://tracker.ceph.com/issues/21474
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 749bbda07522114b99b17a4a01cfcf019520285d)

Merge pull request #18983 from pdvian/wip-22150-luminous

luminous: os/bluestore: fix SharedBlob unregistration

mon/OSDMonitor: add option to fix up ruleset-* to crush-* for ec profiles

The jewel->luminous upgrade test will fail if we finish the upgrade while
a workload setting old-style ec profiles is running.  Add option to
automatically fix them up.  Warn to the cluster log when this happens.

For now, enable this option to ease upgrades and whitelist the warning.

Only include this option in luminous so that we implicitly sunset this
compatibility kludge immediately.

Fixes: http://tracker.ceph.com/issues/22128
Signed-off-by: Sage Weil <sage@redhat.com>

Merge pull request #18751 from shinobu-x/wip-21701-luminous

luminous: ceph-kvstore-tool does not call bluestore's umount when exit

Merge pull request #18750 from shinobu-x/wip-21702-luminous

luminous: BlueStore::umount will crash when the BlueStore is opened by start_kv_only()

Merge pull request #18860 from liewegas/wip-filestore-rocksdb-compression-luminous

luminous: os/filestore: disable rocksdb compression

Reviewed-by: Douglas Fuller <dfuller@redhat.com>

mgr/dashboard: fix audit log loading

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 85e1dadb287ee5216985b16b4a144dfe148d6a60)

doc/ceph-volume create a migration section to help users coming from ceph-disk

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit e433efe51481ec63bc9753a0f446fe2b12b5bb6a)

ceph-disk add deprecation warnings in favor of ceph-volume

Signed-off-by: Alfredo Deza <adeza@redhat.com>
Fixes: http://tracker.ceph.com/issues/22154
(cherry picked from commit c9da92e1ec8d60dc40d86630dab95e4fec4d0d30)

Merge pull request #18973 from ceph/backport-18924

luminous: ceph-volume: allow using a device or partition for `lvm --data`

Reviewed-by: Alfredo Deza <adeza@redhat.com>

ceph-volume tests.devices.lvm prepare isn't bluestore specific anymore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 2f40dbac386be631ac97e2450117c218d9bf02f9)

os/bluestore: fix SharedBlob unregistration

We use the SharedBlobSet remove() in three cases:

- from SharedBlob::put(), we try to remove ourselves from the set, but
  have to deal with a racing lookup, so the removal is conditional on
  nref still being 0.
- from split_cache(), we move the SharedBlob to another collection
- from make_blob_unshared(), we remove the entry when we clear the sbid.

The problem is that the condtiional remove() (for the first case) was being
used for all three cases, and in the second two cases nref is always != 0,
so it doesn't actually happen.  This can lead to a crash during cache
shutdown.

Fix by making two variants: remove() that is unconditional, and
try_remove() that is conditional.

Set the sb->coll pointer after because remove() asserts the parent matches
where we are unregistering.

Fixes: http://tracker.ceph.com/issues/22039
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 78a465b90b1c5187cfec9f25eb58b3bf617ca39b)

Merge pull request #18957 from tchaikov/wip-pr-18808-luminous

luminous: qa: do not wait for down/out osd for pg convergence

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

ceph-volume tests.functional create a common playbook directory for setups

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit def89a411f2f4bdb23c4bbd3b71c1310a564f07d)

doc/ceph-volume lvm prepare can accept devices for --data

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 9bfab348b2ff59c0b939a19c22d4a06bc5236b96)

Conflicts:
doc/ceph-volume/lvm/prepare.rst

ceph-volume tests.functional add setup playbook for xenial filestore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 210c1e1d4770dde47f0008cadaaec35deb729272)

ceph-volume tests.functional add data device and journal to xenial filestore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit d0754e25177b9bf3bce695b7991e99f49312d91c)

ceph-volume tests.functional add setup playbook for xenial bluestore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit d0f5623963f58fc4d5727a79d8377b2191b0f9dc)

ceph-volume tests.functional add raw data device to xenial bluestore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit fbcfb522981cd4039cfe617609c5f160f0b05c52)

ceph-volume tests.functional tox.ini addition of setup playbook for partitions

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit d074b534643dde37d732b34c36c5089e41848d6d)

ceph-volume tests.functional add raw data device to centos7 bluestore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 2d416a849ad7b33dde1386da09c81249e6c2299d)

ceph-volume tests.functional add setup playbook for centos7 bluestore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 161fd373d2f11f64466927e5d615d039822e2ab5)

ceph-volume tests.functional add setup playbook for centos7 filestore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit b3bb147298f8816651f231f77bc91a3a1b50d96f)

ceph-volume tests.functional add raw device to centos7 filestore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit c5b8d72570b24dfd0d2f8c1cc8f13812c6c11a69)

ceph-volume lvm.common update --data flag to reflect device acceptance

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 4df7ea8d83cfa02c8864d043b5d5fb2f5409dc96)

ceph-volume lvm.prepare add example of raw device or partition in help menu

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 6fb8d566aac0e0fa081e6500852855ad177f784f)

ceph-volume lvm.prepare allow partition or raw device as input for --data in filestore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 89236ee3f81e50b9b059c10f6d6e7ce048c06474)

qa: do not wait for down/out osd for pg convergence

that osd is not invovlved in the PG state changes.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 7f549af459b40c5bb51a24a3a443ed7a7116915e)

Merge pull request #18908 from smithfarm/wip-luminous-fixup

qa/suites/fs/basic_functional/clusters: more osds

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>

Merge pull request #18910 from ceph/backport-18882

luminous: ceph-volume: add functional tests for simple, rearrange lvm tests

Reviewed-by: Alfredo Deza <adeza@redhat.com>

ceph-volume tests.functional update lvm/tox.ini paths after moving it

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 7d787849556788961155534039886aedfcdb2a88)

ceph-volume tests.functional move top level tox.ini to lvm/tox.ini

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 9b14b96d3bf6c8326cfc91e657161ffab3b8c2b4)

ceph-volume tests.functional move xenial to lvm/xenial

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 00d576d266b63080129e58482bd6fba62534ee97)

ceph-volume tests.functional lvm move xenial/bluestore to xenial/bluestore/create

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit d5ec7d1c58141f4593ed9d1e4501c9f3be6d9755)

ceph-volume tests.functional lvm move xenial/create to xenial/filestore/create

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit c504b8781b3a31475280a032cd75c9e1eaa6d8c9)

ceph-volume tests.functional move centos7 to lvm/centos7

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit dc1da3fd0aeafe59a82343fb16fe1fcea66ae3eb)

ceph-volume tests.functional lvm move bluestore to bluestore/create

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit aec1a80a3e1e61720f494980711808bfee783a03)

ceph-volume tests.functional lvm move create to filestore/create

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit d6905f3f620d4c733835e21a275d4127cdcb769b)

ceph-volume tests.functional simple xenial bluestore scenario

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 8f0fdc975951a2a8af31bbaa3abd2b5d807a0add)

ceph-volume tests.functional simple xenial filestore scenario

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 7452e1b6f9b82c2ef62bae19c632e81039638ba5)

ceph-volume tests.functional simple tox.ini update for xenial scnearios

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 76ed6a8f2ecab7c58def0453ffed9d8a997e0d5b)

ceph-volume tests.functional simple tox.ini addition for bluestore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 02154e445b87a8fdcabbd699a2532833764140b5)

ceph-volume tests.functional add initial files for simple bluestore activate

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 3320f28e799e1d77d1ea69be9ced603bb69cc5fa)

ceph-volume tests.functional add initial files for simple filestore activate

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 9d18bae52ad77be0e64ef105c33a019446b6f1cf)

ceph-volume tests.functional create a specific test.yml for simple activate

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 37bde0d3b37a87c456438b0edc0cb9e2dcd39120)

ceph-volume tests.functional create a separate tox.ini environ for
`simple`

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 89757ad12e6938fe2bf997e0f21a5ffac082e30b)

Merge pull request #18907 from ceph/luminous-wip-bz1498200

luminous: ceph-volume: support GPT and other deployed OSDs

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

qa/suites/fs/basic_functional/clusters: more osds

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 998122c324047c96c16d60d7fbb3a21f4dd63c56)

doc/ceph-volume include the top level systemd.rst in the toctree

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit e2f281c115c15e820588b478214c3600ff97470f)

ceph-volume simple.activate add --file in help docstring as an example

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit ff60592897b63581ebce372b3f6ffa0f10d2fe5a)

doc/ceph-volume activate has a --file option for json files

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 29913951b71d68b3f3f9b9fa076f309c0252da36)

ceph-volume simple.activate enable the osd when activating

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 366fb8c43af54e9c92f4e95d9a0582c1fc378dbc)