]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #37106 from sebastian-philipp/cephadm-overwritable-templates
authorSebastian Wagner <sebastian.wagner@suse.com>
Tue, 22 Sep 2020 23:34:57 +0000 (01:34 +0200)
committerGitHub <noreply@github.com>
Tue, 22 Sep 2020 23:34:57 +0000 (01:34 +0200)
mgr/cephadm: make j2 teamplates overwritable

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
1  2 
src/pybind/mgr/cephadm/module.py

index 32d090639e170b92567e4b8be1fb74cc289900ed,1722bf42132c74c18fb722a97fc6b30cb28ddd1c..a36a2206500619bae4f409f729324cc698beb1a1
@@@ -394,10 -390,9 +394,10 @@@ class CephadmOrchestrator(orchestrator.
              'node-exporter': self.node_exporter_service,
              'crash': self.crash_service,
              'iscsi': self.iscsi_service,
 +            'container': self.container_service,
          }
  
-         self.template = TemplateMgr()
+         self.template = TemplateMgr(self)
  
          self.requires_post_actions = set()