Skip to content

Dev: Hide lsb and service resource agent class type from UI and doc #1423

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jun 6, 2024
Merged

Dev: Hide lsb and service resource agent class type from UI and doc #1423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion crmsh/ra.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,9 @@
return cache.retrieve("ra_classes")
if can_use_crm_resource():
l = crm_resource("--list-standards")
l = [x for x in l if x not in ("lsb", "service")]

Check warning on line 53 in crmsh/ra.py

View check run for this annotation

Codecov / codecov/patch

crmsh/ra.py#L53 

Added line #L53 was not covered by tests
else:
l = ["heartbeat", "lsb", "ocf", "stonith", "systemd"]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How is heartbeat related to lsb?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"heartbeat" is used by the current ocf1.0 and 1.1 standard and located at
/usr/lib/ocf/resource.d/heartbeat

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

# crm_resource --list-standards
ocf
lsb
service
systemd
stonith

Just synced with the output of --list-standards

l = ["ocf", "stonith", "systemd"]

Check warning on line 55 in crmsh/ra.py

View check run for this annotation

Codecov / codecov/patch

crmsh/ra.py#L55 

Added line #L55 was not covered by tests
l.sort()
return cache.store("ra_classes", l)

Expand Down
2 changes: 1 addition & 1 deletion doc/crm.8.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ clear locate move refresh status up
constraints ls operations restart stop utilization

crm(live)configure# primitive fence-1 <TAB><TAB>
lsb: ocf: service: stonith: systemd:
ocf: stonith: systemd:

crm(live)configure# primitive fence-1 stonith:<TAB><TAB>
apcmaster external/ippower9258 fence_legacy
Expand Down
Loading