From: Joshua Schmid <jschmid@suse.de>
Date: Fri, 18 Sep 2020 08:56:24 +0000 (+0200)
Subject: Merge pull request #36890 from sebastian-philipp/cephadm-extend-ceph.conf
X-Git-Tag: v16.1.0~1059
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1fb9082b0907ca51baafe43293750d93ddde133c;p=ceph-ci.git

Merge pull request #36890 from sebastian-philipp/cephadm-extend-ceph.conf

mgr/cephadm: Add extra-ceph-conf
---

1fb9082b0907ca51baafe43293750d93ddde133c
diff --cc src/pybind/mgr/cephadm/services/cephadmservice.py
index 70d4be20f55,9cfbda3e25a..8acc4f7fa38
--- a/src/pybind/mgr/cephadm/services/cephadmservice.py
+++ b/src/pybind/mgr/cephadm/services/cephadmservice.py
@@@ -353,10 -333,10 +361,10 @@@ class MonService(CephService)
                      'public_network is set but does not look like a CIDR network: \'%s\'' % network)
              extra_config += 'public network = %s\n' % network
  
-         daemon_spec.extra_config = {'config': extra_config}
+         daemon_spec.ceph_conf = extra_config
          daemon_spec.keyring = keyring
  
 -        return self.mgr._create_daemon(daemon_spec)
 +        return daemon_spec
  
      def _check_safe_to_destroy(self, mon_id: str) -> None:
          ret, out, err = self.mgr.check_mon_command({
diff --cc src/pybind/mgr/cephadm/services/iscsi.py
index 1ce858ee535,2db98458c1c..57f3e632a43
--- a/src/pybind/mgr/cephadm/services/iscsi.py
+++ b/src/pybind/mgr/cephadm/services/iscsi.py
@@@ -68,9 -68,9 +68,9 @@@ class IscsiService(CephService)
          igw_conf = self.mgr.template.render('services/iscsi/iscsi-gateway.cfg.j2', context)
  
          daemon_spec.keyring = keyring
-         daemon_spec.extra_config = {'iscsi-gateway.cfg': igw_conf}
+         daemon_spec.extra_files = {'iscsi-gateway.cfg': igw_conf}
  
 -        return self.mgr._create_daemon(daemon_spec)
 +        return daemon_spec
  
      def config_dashboard(self, daemon_descrs: List[DaemonDescription]):
          def get_set_cmd_dicts(out: str) -> List[dict]:
diff --cc src/pybind/mgr/cephadm/services/osd.py
index 87ea6a8482a,0d94696ae57..43238431965
--- a/src/pybind/mgr/cephadm/services/osd.py
+++ b/src/pybind/mgr/cephadm/services/osd.py
@@@ -637,11 -624,8 +631,11 @@@ class OSD
              return None
          for date_field in ['drain_started_at', 'drain_stopped_at', 'drain_done_at', 'process_started_at']:
              if inp.get(date_field):
-                 inp.update({date_field: datetime.strptime(inp.get(date_field, ''), DATEFMT)})
+                 inp.update({date_field: str_to_datetime(inp.get(date_field, ''))})
          inp.update({'remove_util': ctx})
 +        if 'nodename' in inp:
 +            hostname = inp.pop('nodename')
 +            inp['hostname'] = hostname
          return cls(**inp)
  
      def __hash__(self):
diff --cc src/pybind/mgr/cephadm/tests/test_migration.py
index 08e0abd5a61,13647c7ceee..ac2011f1b3a
--- a/src/pybind/mgr/cephadm/tests/test_migration.py
+++ b/src/pybind/mgr/cephadm/tests/test_migration.py
@@@ -1,13 -1,11 +1,14 @@@
  import json
  from datetime import datetime
  
 +import pytest
 +
  from ceph.deployment.service_spec import PlacementSpec, ServiceSpec, HostPlacementSpec
  from cephadm import CephadmOrchestrator
- from cephadm.inventory import SPEC_STORE_PREFIX, DATEFMT
+ from cephadm.inventory import SPEC_STORE_PREFIX
+ from cephadm.utils import DATEFMT
  from cephadm.tests.fixtures import _run_cephadm, cephadm_module, wait, with_host
 +from orchestrator import OrchestratorError
  from tests import mock