From: Sage Weil <sage@redhat.com>
Date: Thu, 30 Jan 2020 15:28:38 +0000 (-0600)
Subject: Merge PR #32878 into master
X-Git-Tag: v15.1.1~604
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=88af16ccd0149c7c8b2a95e6d47f8a878f8b1b96;p=ceph.git

Merge PR #32878 into master

* refs/pull/32878/head:
	cephadm: share code between 'pull' and 'inspect-image'
	mgr/cephadm: upgrade: pull image after upgrade start, and for each host
	cephadm: add inspect-image command

Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

88af16ccd0149c7c8b2a95e6d47f8a878f8b1b96
diff --cc src/pybind/mgr/cephadm/module.py
index 6b73e00a7c554,43e69fd9b0c3b..a084635dece65
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@@ -1968,16 -1874,13 +1998,13 @@@ class CephadmOrchestrator(MgrModule, or
                                        self.upgrade_state.get('target_name'))
              return trivial_result('Upgrade to %s in progress' %
                                    self.upgrade_state.get('target_name'))
-         target_id, target_version = self._get_container_image_id(target_name)
          self.upgrade_state = {
              'target_name': target_name,
-             'target_id': target_id,
-             'target_version': target_version,
          }
          self._save_upgrade_state()
 -        self._clear_health_checks()
 +        self._clear_upgrade_health_checks()
          self.event.set()
-         return trivial_result('Initiating upgrade to %s %s' % (image, target_id))
+         return trivial_result('Initiating upgrade to %s' % (image))
  
      def upgrade_pause(self):
          if not self.upgrade_state: