Commit Graph

6 Commits

Author SHA1 Message Date
Sage Weil
40b70c632d cephadm: move mon creation config bits into mgr/cephadm
There's no need for mgr/cephadm to pass --mon-* arguments to
/usr/bin/cephadm just so it can add bits to the config file when the
config file is also being passed in from mgr/cephadm.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-22 10:50:23 -06:00
Sage Weil
e43c7cd6dd qa/workunits/cephadm/test_cephadm.sh: detect python3 and python2
Only test on whichever pythons are available on the host.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-21 09:03:55 -06:00
Michael Fritch
34a2bb4495
qa/workunits/cephadm/test_cephadm.sh: re-enable adopt tests
Signed-off-by: Michael Fritch <mfritch@suse.com>
2019-12-13 07:44:34 -07:00
Sage Weil
feaa79f902 qa/workunits/cephadm/test_cephadm.sh: need --fsid always
Otherwise the test breaks if there are other cluster(s) on the host (like
there normally are in my dev environment).

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-12 10:46:15 -06:00
Sage Weil
d120ffcdff ceph-daemon-adoption-corpus -> cephadm-adoption-corpus
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 19:14:17 -06:00
Sage Weil
137fa64e12 qa: rename ceph-daemon tests -> cephadm
Also move the workunit to a better location.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 19:14:09 -06:00