cephadm: set CEPH_USE_RANDOM_NONCE if using --init

This ensures that daemon messenger nonces don't collide by using PIDs that are
no longer unique for the IP address.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 576823bcb67eec0d0899ad961be07da7c0856732)

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 16ae2e09a860b43beb077c261710368c9ba3702a..06dbe006b8bcdd7a8d4afc75d14d633fa9fcd92f 100755 (executable)
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -2581,6 +2581,7 @@ class CephContainer:
             cmd_args.append('--cap-add=SYS_PTRACE')
         if self.init:
             cmd_args.append('--init')
+            envs += ['-e', 'CEPH_USE_RANDOM_NONCE=1']
         if self.cname:
             cmd_args.extend(['--name', self.cname])
         if self.envs:
@@ -2621,6 +2622,7 @@ class CephContainer:
             ])
         if self.init:
             cmd_args.append('--init')
+            envs += ['-e', 'CEPH_USE_RANDOM_NONCE=1']
         if self.envs:
             for env in self.envs:
                 envs.extend(['-e', env])