From: Michael Fritch <mfritch@suse.com>
Date: Mon, 8 Mar 2021 14:28:51 +0000 (-0700)
Subject: cephadm: default `container_init` to False
X-Git-Tag: v15.2.13~13^2~19^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=82d30afc413023a6cbb19f6529cae3c1e7e63a1d;p=ceph.git

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 06dbe006b8b..772ec6e3cea 100755
--- 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 405d40655b0..ae327c0cd80 100644
--- 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