cephadm: default `container_init` to False

octopus supports podman < 2.0 which does not have the `--init` flag

Signed-off-by: Michael Fritch <mfritch@suse.com>

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 06dbe006b8bcdd7a8d4afc75d14d633fa9fcd92f..772ec6e3cea9e81ef18cf7aee04ab456b3658ae4 100755 (executable)
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -10,7 +10,7 @@ LOGROTATE_DIR = '/etc/logrotate.d'
 UNIT_DIR = '/etc/systemd/system'
 LOG_DIR_MODE = 0o770
 DATA_DIR_MODE = 0o700
-CONTAINER_INIT=True
+CONTAINER_INIT=False
 CONTAINER_PREFERENCE = ['podman', 'docker']  # prefer podman to docker
 CUSTOM_PS1 = r'[ceph: \u@\h \W]\$ '
 DEFAULT_TIMEOUT = None  # in seconds

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 405d40655b0961020cbf7cb68bc4438846509ae0..ae327c0cd800d33c8565820308a6ad15991d1231 100644 (file)
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -225,7 +225,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
         {
             'name': 'container_init',
             'type': 'bool',
-            'default': True,
+            'default': False,
             'desc': 'Run podman/docker with `--init`',
         },
         {
@@ -310,7 +310,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
             self.warn_on_stray_daemons = True
             self.warn_on_failed_host_check = True
             self.allow_ptrace = False
-            self.container_init = True
+            self.container_init = False
             self.prometheus_alerts_path = ''
             self.migration_current: Optional[int] = None
             self.config_dashboard = True