Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mgr/orchestrator,cephadm: clean up 'orch ls', osd services #40736

Merged
merged 3 commits into from Apr 12, 2021

Commits on Apr 9, 2021

  1. mgr/orchestrator: remove IMAGE ID from 'orch ls'

    This is not very useful at this level:
     - we see it from 'orch ps'
     - it can be a mix of ids during upgrade
     - some services may have multiple images at steady state (e.g., ingress)
    
    Signed-off-by: Sage Weil <sage@newdream.net>
    liewegas committed Apr 9, 2021
    Copy the full SHA
    2b63ae2 View commit details
    Browse the repository at this point in the history
  2. mgr/orchestrator: report osds as osd.unmanaged as appropriate

    If there is no osdspec_affinity or service_name (from unit.meta), then
    report as 'osd.unmanaged'.
    
    Signed-off-by: Sage Weil <sage@newdream.net>
    liewegas committed Apr 9, 2021
    Copy the full SHA
    5adef5f View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2021

  1. mgr/cephadm: rewrite/simplify describe_service

    The prior implementation first tried to fabricate services based on the
    running daemons, and then filled in defined services on top.  This led
    to duplication and a range of small errors.
    
    Instead, flip this around: start with the services that are defined,
    and only fill in 'unmanaged' services where we need to.
    
    Drop the osd kludges and instead rely on DaemonDescription.service_id to
    return the right thing.
    
    Signed-off-by: Sage Weil <sage@newdream.net>
    liewegas committed Apr 10, 2021
    Copy the full SHA
    58d9e90 View commit details
    Browse the repository at this point in the history