Skip to content

Commit

Permalink
Dev: ra: Drop legacy code to get metadata of the pacemaker daemons (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
liangxin1300 authored Dec 30, 2024
2 parents aae750f + 9bdac41 commit 14da522
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 23 deletions.
2 changes: 1 addition & 1 deletion crmsh/cibconfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from . import crm_gv
from . import ui_utils
from . import userdir
from .ra import get_ra, get_properties_list, get_pe_meta, get_properties_meta, RAInfo, get_resource_meta_list
from .ra import get_ra, get_properties_list, get_properties_meta, RAInfo, get_resource_meta_list
from .utils import ext_cmd, safe_open_w, pipe_string, safe_close_w, crm_msec
from .utils import ask, lines2cli, olist
from .utils import page_string, str2tmp, ensure_sudo_readable
Expand Down
24 changes: 2 additions & 22 deletions crmsh/ra.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,40 +185,20 @@ def ra_meta(ra_class, ra_type, ra_provider):
return l


@utils.memoize
def get_pe_meta():
return RAInfo(utils.pacemaker_schedulerd(), "metadata")


@utils.memoize
def get_crmd_meta():
return RAInfo(utils.pacemaker_controld(), "metadata",
exclude_from_completion=constants.controld_metadata_do_not_complete)


@utils.memoize
def get_stonithd_meta():
return RAInfo(utils.pacemaker_fenced(), "metadata")


@utils.memoize
def get_cib_meta():
return RAInfo(utils.pacemaker_based(), "metadata")


@utils.memoize
def get_properties_meta():
cluster_option_meta = utils.get_cluster_option_metadata()
if cluster_option_meta:
return RAInfo("cluster_option", None,
exclude_from_completion=constants.controld_metadata_do_not_complete,
meta_string=cluster_option_meta)
# get_xxx_meta() is a legacy code to get the metadata of the pacemaker daemons,
# which will be dropped when we fully adopt to crmsh-5.x with pacemaker 3.x.
meta = copy.deepcopy(get_crmd_meta())
meta.add_ra_params(get_pe_meta())
meta.add_ra_params(get_cib_meta())
return meta
else:
raise ValueError("No cluster option metadata found")


@utils.memoize
Expand Down

0 comments on commit 14da522

Please sign in to comment.