cephadm: fix base class behavior on python3.6

This fixes the cephadm test files when running tox/pytest on python3.6
(centos/rhel 8).
Long story short, combining classmethod and property on py3.6 behaves
differently from py3.7 and up. Since the classmethod is actually
unnecessary for the base class to behave as it does, we drop that
decorator.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 7440d7a3c07d3e83ebb2ea7ac9cbbd94762e78ed)

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 0e769043ab6dbb27c1d054551826eb2427add2cd..47b245869d85998fdff0404523c9d92e225ee890 100755 (executable)
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -230,9 +230,8 @@ class ContainerEngine:
     def __init__(self) -> None:
         self.path = find_program(self.EXE)
 
-    @classmethod
     @property
-    def EXE(cls) -> str:
+    def EXE(self) -> str:
         raise NotImplementedError()
 
     def __str__(self) -> str: