From fc9c231e8091542bbc807f25652dfa544a5801cb Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Thu, 30 Jan 2020 14:09:37 -0600
Subject: [PATCH] cephadm: adopt: by default, pull first

This just bit me: I had a months-old container revision locally and ended
up accidentally starting up ancient monitor code.

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/cephadm/cephadm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 3fffbe8e21401..5d8b0518ef5b3 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -2246,6 +2246,10 @@ def list_daemons(detail=True, legacy_dir=None):
 def command_adopt():
     # type: () -> None
 
+    if not args.skip_pull:
+        logger.info('Pulling latest %s container...' % args.image)
+        call_throws([container_path, 'pull', args.image])
+
     (daemon_type, daemon_id) = args.name.split('.', 1)
     (uid, gid) = extract_uid_gid()
     if args.style == 'legacy':
@@ -2558,6 +2562,10 @@ def _get_parser():
         '--skip-firewalld',
         action='store_true',
         help='Do not configure firewalld')
+    parser_adopt.add_argument(
+        '--skip-pull',
+        action='store_true',
+        help='do not pull the latest image before adopting')
 
     parser_rm_daemon = subparsers.add_parser(
         'rm-daemon', help='remove daemon instance')
-- 
2.39.5