]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
mgr/cephadm: do not specify --image arg for non-ceph daemons; fix upgrade
authorSage Weil <sage@redhat.com>
Fri, 6 Mar 2020 03:24:53 +0000 (21:24 -0600)
committerSage Weil <sage@redhat.com>
Fri, 6 Mar 2020 03:28:36 +0000 (21:28 -0600)
commit725990f9d35c5aac8d94aa6c9518101908da1ea4
tree471f9150f648f3cd41d2f7eb7e30e1438c6e4264
parent4e829f1df0444dfdcb54de293650a205ff157ab3
mgr/cephadm: do not specify --image arg for non-ceph daemons; fix upgrade

If we are calling the cephadm script for a non-ceph daemon (prometheus,
etc), do not specify the --image argument, and do not pull it out of
the config db from sections that don't exist.

Signed-off-by: Sage Weil <sage@redhat.com>
src/pybind/mgr/cephadm/module.py