import ceph quincy 17.2.1

[ceph.git] / ceph / src / pybind / mgr / cephadm / utils.py

diff --git a/ceph/src/pybind/mgr/cephadm/utils.py b/ceph/src/pybind/mgr/cephadm/utils.py
index 99e1683ed0376fc6fb645f9af535944903d0fceb..28811fc3aceda1eff16e3891ed6e59d0678f127d 100644 (file)
--- a/ceph/src/pybind/mgr/cephadm/utils.py
+++ b/ceph/src/pybind/mgr/cephadm/utils.py
@@ -23,7 +23,9 @@ class CephadmNoImage(Enum):
 # NOTE: order important here as these are used for upgrade order
 CEPH_TYPES = ['mgr', 'mon', 'crash', 'osd', 'mds', 'rgw', 'rbd-mirror', 'cephfs-mirror']
 GATEWAY_TYPES = ['iscsi', 'nfs']
-MONITORING_STACK_TYPES = ['node-exporter', 'prometheus', 'alertmanager', 'grafana']
+MONITORING_STACK_TYPES = ['node-exporter', 'prometheus',
+                          'alertmanager', 'grafana', 'loki', 'promtail']
+RESCHEDULE_FROM_OFFLINE_HOSTS_TYPES = ['nfs']
 
 CEPH_UPGRADE_ORDER = CEPH_TYPES + GATEWAY_TYPES + MONITORING_STACK_TYPES