• R/O
  • SSH

pm_diskd: Commit

※ リポジトリは、pm-diskd ブランチが https://github.com/linux-ha-japan/pm_diskd-1.0 へ、pm-diskd-2.0ブランチが https://github.com/linux-ha-japan/pm_diskd へ移行しました。

Pacemaker 対応ディスク故障監視機能。

Pacemaker-1.0公式リポジトリのクローンに対し、パッチ作成用のブランチを作成して管理する。
ブランチ名: pm-diskd

初回 hg clone 実行後は、hg update -r pm-diskd を実行すること。

Heartbeat-2.1.4 用 hb-diskd(*) のPacemaker対応版
(*) http://sourceforge.jp/projects/linux-ha/releases/?package_id=10555


Commit MetaInfo

Revision4f8c36ade2b70ac85bcf6eb45eb359df3243460f (tree)
Time2010-06-23 20:48:01
AuthorDejan Muhamedagic <dejan@hell...>
CommiterDejan Muhamedagic

Log Message

Medium: Shell: add support for classes to the providers command
(transplanted from e2563570db42a532fa1aa0406c07006a21b36000)

Change Summary

Incremental Difference

diff -r 30d4ea631493 -r 4f8c36ade2b7 doc/crm_cli.txt
--- a/doc/crm_cli.txt Mon Jun 07 17:06:53 2010 +0200
+++ b/doc/crm_cli.txt Wed Jun 23 13:48:01 2010 +0200
@@ -595,14 +595,15 @@
595595 meta stonith:ipmilan
596596 ...............
597597
598-[[cmdhelp_ra_providers,show providers for a RA]]
598+[[cmdhelp_ra_providers,show providers for a RA and a class]]
599599 ==== `providers`
600600
601-List providers for a resource agent type.
601+List providers for a resource agent type. The class parameter
602+defaults to `ocf`.
602603
603604 Usage:
604605 ...............
605- providers <type>
606+ providers <type> [<class>]
606607 ...............
607608 Example:
608609 ...............
diff -r 30d4ea631493 -r 4f8c36ade2b7 shell/modules/ra.py.in
--- a/shell/modules/ra.py.in Mon Jun 07 17:06:53 2010 +0200
+++ b/shell/modules/ra.py.in Wed Jun 23 13:48:01 2010 +0200
@@ -64,7 +64,7 @@
6464 'List of providers for a class:type.'
6565 return self.lrmadmin("-P %s %s" % (ra_class,ra_type),True)
6666 def classes(self):
67- 'List of providers for a class:type.'
67+ 'List of classes.'
6868 return self.lrmadmin("-C")
6969 def types(self, ra_class = "ocf", ra_provider = ""):
7070 'List of types for a class.'
diff -r 30d4ea631493 -r 4f8c36ade2b7 shell/modules/ui.py.in
--- a/shell/modules/ui.py.in Mon Jun 07 17:06:53 2010 +0200
+++ b/shell/modules/ui.py.in Wed Jun 23 13:48:01 2010 +0200
@@ -1103,7 +1103,7 @@
11031103 self.help_table = help_sys.load_level("ra")
11041104 self.cmd_table["classes"] = (self.classes,(0,0),0)
11051105 self.cmd_table["list"] = (self.list,(1,2),1)
1106- self.cmd_table["providers"] = (self.providers,(1,1),1)
1106+ self.cmd_table["providers"] = (self.providers,(1,2),1)
11071107 self.cmd_table["meta"] = (self.meta,(1,3),1)
11081108 self.cmd_aliases.update({
11091109 "meta": ("info",),
@@ -1116,9 +1116,9 @@
11161116 print "%s / %s" % (c,' '.join(ra_providers_all(c)))
11171117 else:
11181118 print "%s" % c
1119- def providers(self,cmd,ra_type):
1120- "usage: providers <ra>"
1121- print ' '.join(ra_providers(ra_type))
1119+ def providers(self,cmd,ra_type,ra_class = "ocf"):
1120+ "usage: providers <ra> [<class>]"
1121+ print ' '.join(ra_providers(ra_type,ra_class))
11221122 def list(self,cmd,c,p = None):
11231123 "usage: list <class> [<provider>]"
11241124 if not c in ra_classes():
Show on old repository browser