RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-12 13:29:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #34027 into octopus

Browse Source 
* refs/pull/34027/head:
	qa/workunits/cephadm/test_cephadm: mark services unmanaged for test
	mgr/cephadm: do not reconfig unmanaged services
	qa/workunits/cephadm/test_cephadm: output file for pub key

Reviewed-by: Sebastian Wagner <swagner@suse.com>
This commit is contained in:
Sage Weil 2020-03-19 08:22:40 -05:00
commit 3ed3f34b98
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qa/workunits/cephadm/test_cephadm.sh
View File

@ -190,6 +190,7 @@ $CEPHADM bootstrap \
--config $ORIG_CONFIG \
--output-config $CONFIG \
--output-keyring $KEYRING \
--output-pub-ssh-key $TMPDIR/ceph.pub \
--allow-overwrite \
--skip-mon-network \
--skip-monitoring-stack
@ -213,6 +214,11 @@ systemctl | grep system-ceph | grep -q .slice # naming is escaped and annoying
$CEPHADM shell --fsid $FSID --config $CONFIG --keyring $KEYRING -- \
ceph -s | grep $FSID
for t in mon mgr node-exporter prometheus grafana; do
$CEPHADM shell --fsid $FSID --config $CONFIG --keyring $KEYRING -- \
ceph orch apply $t --unmanaged
done
## ls
$CEPHADM ls | jq '.[]' | jq 'select(.name == "mon.a").fsid' \
| grep $FSID
@ -301,6 +307,8 @@ $CEPHADM shell --fsid $FSID --config $CONFIG --keyring $KEYRING -- \
ceph osd pool create $nfs_rados_pool 64
$CEPHADM shell --fsid $FSID --config $CONFIG --keyring $KEYRING -- \
rados --pool nfs-ganesha --namespace nfs-ns create conf-nfs.a
$CEPHADM shell --fsid $FSID --config $CONFIG --keyring $KEYRING -- \
ceph orch pause
$CEPHADM deploy --name nfs.a \
--fsid $FSID \
--keyring $KEYRING \
@ -308,6 +316,8 @@ $CEPHADM deploy --name nfs.a \
--config-json ${CEPHADM_SAMPLES_DIR}/nfs.json
cond="$SUDO ss -tlnp '( sport = :nfs )' | grep 'ganesha.nfsd'"
is_available "nfs" "$cond" 10
$CEPHADM shell --fsid $FSID --config $CONFIG --keyring $KEYRING -- \
ceph orch resume
## run
# WRITE ME

8
src/pybind/mgr/cephadm/module.py
View File

@ -2431,13 +2431,17 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
grafanas = [] # type: List[orchestrator.DaemonDescription]
for dd in daemons:
# orphan?
if dd.service_name() not in self.spec_store.specs and \
dd.daemon_type not in ['mon', 'mgr', 'osd']:
spec = self.spec_store.specs.get(dd.service_name(), None)
if not spec and dd.daemon_type not in ['mon', 'mgr', 'osd']:
# (mon and mgr specs should always exist; osds aren't matched
# to a service spec)
self.log.info('Removing orphan daemon %s...' % dd.name())
self._remove_daemon(dd.name(), dd.hostname)
# ignore unmanaged services
if not spec or spec.unmanaged:
continue
# dependencies?
if dd.daemon_type == 'grafana':
# put running instances at the front of the list