]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #32878 into master
authorSage Weil <sage@redhat.com>
Thu, 30 Jan 2020 15:28:38 +0000 (09:28 -0600)
committerSage Weil <sage@redhat.com>
Thu, 30 Jan 2020 15:28:38 +0000 (09:28 -0600)
* 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>
1  2 
src/cephadm/cephadm
src/pybind/mgr/cephadm/module.py

Simple merge
index 6b73e00a7c55481a3a7d79b4c1d25ee56bae6c9b,43e69fd9b0c3bcdae5f66c5af25c7c4959fa1b13..a084635dece65e516a50b3c371d03435e2de314a
@@@ -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: