mgr/cephadm: SpecStore: use d-under accessor methods

This fixes a conflict between:

* 1fcdad17685a8884135a2cda0cdfe3525e325474
* 2c7f899124207d0d4866e16d9eb5609777ea22e8

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

diff --git a/src/pybind/mgr/cephadm/services/ha_rgw.py b/src/pybind/mgr/cephadm/services/ha_rgw.py
index ea40f92a05479febdc0f575f7bbb5c8e8be889ee..0a7bede49cd7db0b50f5ff07673484f1f5253db3 100644 (file)
--- a/src/pybind/mgr/cephadm/services/ha_rgw.py
+++ b/src/pybind/mgr/cephadm/services/ha_rgw.py
@@ -23,9 +23,9 @@ class HA_RGWService(CephService):
         # spec should be in spec store
         if not daemon_spec.spec:
             service_name: str = "ha-rgw." + daemon_spec.daemon_id.split('.')[0]
-            if service_name in self.mgr.spec_store.specs:
+            if service_name in self.mgr.spec_store:
                 daemon_spec.spec = cast(
-                    HA_RGWSpec, self.mgr.spec_store.specs.get(service_name))
+                    HA_RGWSpec, self.mgr.spec_store[service_name].spec)
         assert daemon_spec.spec
 
         if daemon_spec.daemon_type == 'haproxy':

diff --git a/src/pybind/mgr/cephadm/services/iscsi.py b/src/pybind/mgr/cephadm/services/iscsi.py
index 9ece14f086cb80fec35a5f4457f6cb913c459031..2241b214935955d4f5ef083bb313fce3cd7ec29f 100644 (file)
--- a/src/pybind/mgr/cephadm/services/iscsi.py
+++ b/src/pybind/mgr/cephadm/services/iscsi.py
@@ -30,9 +30,9 @@ class IscsiService(CephService):
         # spec should be in spec store
         if not daemon_spec.spec:
             service_name: str = "iscsi." + daemon_spec.daemon_id.split('.')[0]
-            if service_name in self.mgr.spec_store.specs:
+            if service_name in self.mgr.spec_store:
                 daemon_spec.spec = cast(
-                    IscsiServiceSpec, self.mgr.spec_store.specs.get(service_name))
+                    IscsiServiceSpec, self.mgr.spec_store[service_name].spec)
         assert daemon_spec.spec
 
         spec = daemon_spec.spec

diff --git a/src/pybind/mgr/cephadm/services/monitoring.py b/src/pybind/mgr/cephadm/services/monitoring.py
index 8937be1b9f3a54490af6bc648fc6e51f32bc7e40..0dd8e58075a30a627b896dfb58ebb9a26d3d58da 100644 (file)
--- a/src/pybind/mgr/cephadm/services/monitoring.py
+++ b/src/pybind/mgr/cephadm/services/monitoring.py
@@ -101,9 +101,9 @@ class AlertmanagerService(CephadmService):
         # spec should be in spec store
         if not daemon_spec.spec:
             service_name: str = "alertmanager"
-            if service_name in self.mgr.spec_store.specs:
+            if service_name in self.mgr.spec_store:
                 daemon_spec.spec = cast(
-                    AlertManagerSpec, self.mgr.spec_store.specs.get(service_name))
+                    AlertManagerSpec, self.mgr.spec_store[service_name].spec)
         assert daemon_spec.spec
         daemon_spec.final_config, daemon_spec.deps = self.generate_config(daemon_spec)
         return daemon_spec

diff --git a/src/pybind/mgr/cephadm/services/nfs.py b/src/pybind/mgr/cephadm/services/nfs.py
index e74224a5f6e0b271a94fa431ad54388611b6eb4e..b4e884f330d3031d6291619f56623b653f7d9f52 100644 (file)
--- a/src/pybind/mgr/cephadm/services/nfs.py
+++ b/src/pybind/mgr/cephadm/services/nfs.py
@@ -30,9 +30,9 @@ class NFSService(CephService):
         # spec should be in spec store
         if not daemon_spec.spec:
             service_name: str = "nfs." + daemon_spec.daemon_id.split('.')[0]
-            if service_name in self.mgr.spec_store.specs:
+            if service_name in self.mgr.spec_store:
                 daemon_spec.spec = cast(
-                    NFSServiceSpec, self.mgr.spec_store.specs.get(service_name))
+                    NFSServiceSpec, self.mgr.spec_store[service_name].spec)
         assert daemon_spec.spec
 
         daemon_id = daemon_spec.daemon_id