Send Linux-ha-cvs mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: crm by andrew from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 19 Apr 2006 07:22:11 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm
Modified Files:
crm-1.0.dtd
Log Message:
Remove some legacy stuff
Add some missing id fields
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crm-1.0.dtd,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- crm-1.0.dtd 19 Apr 2006 05:58:49 -0000 1.58
+++ crm-1.0.dtd 19 Apr 2006 13:22:10 -0000 1.59
@@ -38,7 +38,7 @@
<!ELEMENT configuration (crm_config, nodes, resources, constraints)>
<!-- Annotated version -->
-<!ELEMENT crm_config (cluster_property_set|nvpair)*>
+<!ELEMENT crm_config (cluster_property_set)*>
<!ELEMENT cluster_property_set (rule*, attributes)>
<!ATTLIST cluster_property_set
id CDATA #REQUIRED
@@ -64,12 +64,10 @@
type CDATA #REQUIRED
provider CDATA #IMPLIED
- is_managed (true|1|false|0) 'true'
- on_stopfail (ignore|stonith|block) #IMPLIED
+ is_managed (true|1|false|0) 'true'
restart_type (ignore|restart) 'ignore'
multiple_active (stop_start|stop_only|block) 'stop_start'
- resource_stickiness (0|INFINITY|-INFINITY) '0'
- start_prereq (nothing|quorum|fencing) #IMPLIED>
+ resource_stickiness (0|INFINITY|-INFINITY) '0'>
<!-- Annotated version -->
<!ELEMENT operations (op*)>
@@ -81,9 +79,9 @@
interval CDATA #IMPLIED
timeout CDATA #IMPLIED
disabled (true|1|false|0) 'false'
- role (Master|Slave|Started|Stopped) 'Started'
- prereq (nothing|quorum|fencing) #IMPLIED
- on_fail (nothing|block|stop|fence) #IMPLIED>
+ role (Master|Slave|Started|Stopped) 'Started'
+ prereq (nothing|quorum|fencing) #IMPLIED
+ on_fail (nothing|block|stop|fence) #IMPLIED>
<!-- Annotated version -->
<!ELEMENT group (primitive+,instance_attributes*)>
@@ -92,11 +90,9 @@
description CDATA #IMPLIED
is_managed (true|1|false|0) 'true'
- on_stopfail (ignore|stonith|block) #IMPLIED
restart_type (ignore|restart) 'ignore'
multiple_active (stop_start|stop_only|block) 'stop_start'
resource_stickiness (0|INFINITY|-INFINITY) '0'
- start_prereq (nothing|quorum|fencing) #IMPLIED
ordered (true|1|false|0) 'true'
collocated (true|1|false|0) 'true'>
@@ -106,11 +102,9 @@
description CDATA #IMPLIED
is_managed (true|1|false|0) 'true'
- on_stopfail (ignore|stonith|block) #IMPLIED
restart_type (ignore|restart) 'ignore'
multiple_active (stop_start|stop_only|block) 'stop_start'
resource_stickiness (0|INFINITY|-INFINITY) '0'
- start_prereq (nothing|quorum|fencing) #IMPLIED
notify (true|1|false|0) 'false'
globally_unique (true|1|false|0) 'true'
@@ -123,11 +117,9 @@
description CDATA #IMPLIED
is_managed (true|1|false|0) 'true'
- on_stopfail (ignore|stonith|block) #IMPLIED
restart_type (ignore|restart) 'ignore'
multiple_active (stop_start|stop_only|block) 'stop_start'
resource_stickiness (0|INFINITY|-INFINITY) '0'
- start_prereq (nothing|quorum|fencing) #IMPLIED
notify (true|1|false|0) 'false'
globally_unique (true|1|false|0) 'true'
@@ -143,7 +135,7 @@
<!-- Annotated version -->
-<!ELEMENT constraints (rsc_order*, rsc_colocation*, rsc_location*)>
+<!ELEMENT constraints (rsc_order|rsc_colocation|rsc_location)*>
<!ELEMENT rsc_order (lifetime?)>
<!ATTLIST rsc_order
id CDATA #REQUIRED
@@ -168,6 +160,7 @@
description CDATA #IMPLIED
rsc CDATA #REQUIRED>
<!ELEMENT lifetime (rule+)>
+<!ATTLIST lifetime id CDATA #REQUIRED>
<!-- Annotated version -->
<!ELEMENT rule (expression|time_expression|rule)+>
@@ -190,6 +183,7 @@
<!ELEMENT date_expression (date_spec?,duration?)>
<!ATTLIST date_expression
+ id CDATA #REQUIRED
operation (in_range|date_spec|gt|lt) 'in_range'
start CDATA #IMPLIED
end CDATA #IMPLIED>
@@ -197,6 +191,7 @@
<!ELEMENT date_spec EMPTY>
<!ATTLIST date_spec
+ id CDATA #REQUIRED
monthdays CDATA #IMPLIED
weekdays CDATA #IMPLIED
yeardays CDATA #IMPLIED
@@ -208,6 +203,7 @@
<!ELEMENT duration EMPTY>
<!ATTLIST duration
+ id CDATA #REQUIRED
monthdays CDATA #IMPLIED
weekdays CDATA #IMPLIED
yeardays CDATA #IMPLIED
@@ -217,7 +213,7 @@
<!-- Annotated version -->
<!ELEMENT status (node_state*)>
-<!ELEMENT node_state (transient_attributes|lrm)*>
+<!ELEMENT node_state ((transient_attributes|lrm), (transient_attributes|lrm))>
<!ATTLIST node_state
id CDATA #REQUIRED
uname CDATA #REQUIRED
------------------------------
Message: 2
Date: Wed, 19 Apr 2006 07:23:46 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm
Modified Files:
crm-1.0.dtd
Log Message:
Formatting
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crm-1.0.dtd,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- crm-1.0.dtd 19 Apr 2006 13:22:10 -0000 1.59
+++ crm-1.0.dtd 19 Apr 2006 13:23:46 -0000 1.60
@@ -16,25 +16,27 @@
-->
+<!-- Annotated version -->
+
<!ELEMENT cib (configuration, status)>
<!ATTLIST cib
- cib-last-written CDATA #IMPLIED
+ cib-last-written CDATA #IMPLIED
+
+ admin_epoch CDATA #REQUIRED
+ epoch CDATA #REQUIRED
+ num_updates CDATA #REQUIRED
+ num_peers CDATA #IMPLIED
- admin_epoch CDATA #REQUIRED
- epoch CDATA #REQUIRED
- num_updates CDATA #REQUIRED
- num_peers CDATA #IMPLIED
-
- dc_uuid CDATA #IMPLIED
- ccm_transition CDATA #IMPLIED
- have_quorum (true|1|false|0) 'false'
- ignore_dtd (true|1|false|0) #IMPLIED
cib_feature_revision CDATA #IMPLIED
crm_feature_set CDATA #IMPLIED
+ dc_uuid CDATA #IMPLIED
+ ccm_transition CDATA #IMPLIED
+ have_quorum (true|1|false|0) 'false'
+ ignore_dtd (true|1|false|0) #IMPLIED
+
generated CDATA #IMPLIED
crm-debug-origin CDATA #IMPLIED>
-
<!ELEMENT configuration (crm_config, nodes, resources, constraints)>
<!-- Annotated version -->
@@ -43,16 +45,15 @@
<!ATTLIST cluster_property_set
id CDATA #REQUIRED
score CDATA #IMPLIED>
-
-<!ELEMENT nodes (node*)>
+<!ELEMENT nodes (node*)>
<!-- Annotated version -->
<!ELEMENT node (instance_attributes*)>
<!ATTLIST node
- id CDATA #REQUIRED
- uname CDATA #REQUIRED
- description CDATA #IMPLIED
- type (normal|member|ping) #REQUIRED>
+ id CDATA #REQUIRED
+ uname CDATA #REQUIRED
+ description CDATA #IMPLIED
+ type (normal|member|ping) #REQUIRED>
<!ELEMENT resources (primitive|group|clone|master_slave)*>
<!-- Annotated version -->
@@ -78,61 +79,60 @@
description CDATA #IMPLIED
interval CDATA #IMPLIED
timeout CDATA #IMPLIED
- disabled (true|1|false|0) 'false'
+ disabled (true|1|false|0) 'false'
role (Master|Slave|Started|Stopped) 'Started'
- prereq (nothing|quorum|fencing) #IMPLIED
- on_fail (nothing|block|stop|fence) #IMPLIED>
+ prereq (nothing|quorum|fencing) #IMPLIED
+ on_fail (nothing|block|stop|fence) #IMPLIED>
<!-- Annotated version -->
<!ELEMENT group (primitive+,instance_attributes*)>
<!ATTLIST group
- id CDATA #REQUIRED
+ id CDATA #REQUIRED
description CDATA #IMPLIED
- is_managed (true|1|false|0) 'true'
- restart_type (ignore|restart) 'ignore'
- multiple_active (stop_start|stop_only|block) 'stop_start'
- resource_stickiness (0|INFINITY|-INFINITY) '0'
+ is_managed (true|1|false|0) 'true'
+ restart_type (ignore|restart) 'ignore'
+ multiple_active (stop_start|stop_only|block) 'stop_start'
+ resource_stickiness (0|INFINITY|-INFINITY) '0'
- ordered (true|1|false|0) 'true'
- collocated (true|1|false|0) 'true'>
+ ordered (true|1|false|0) 'true'
+ collocated (true|1|false|0) 'true'>
<!ELEMENT clone (instance_attributes*, (primitive|group))>
<!ATTLIST clone
id CDATA #REQUIRED
description CDATA #IMPLIED
- is_managed (true|1|false|0) 'true'
- restart_type (ignore|restart) 'ignore'
- multiple_active (stop_start|stop_only|block) 'stop_start'
- resource_stickiness (0|INFINITY|-INFINITY) '0'
- notify (true|1|false|0) 'false'
+ is_managed (true|1|false|0) 'true'
+ restart_type (ignore|restart) 'ignore'
+ multiple_active (stop_start|stop_only|block) 'stop_start'
+ resource_stickiness (0|INFINITY|-INFINITY) '0'
+
+ notify (true|1|false|0) 'false'
+ globally_unique (true|1|false|0) 'true'
+ ordered (true|1|false|0) 'true'
+ interleave (true|1|false|0) 'false'>
- globally_unique (true|1|false|0) 'true'
- ordered (true|1|false|0) 'true'
- interleave (true|1|false|0) 'false'>
<!ELEMENT master_slave (instance_attributes*, (primitive|group))>
<!ATTLIST master_slave
id CDATA #REQUIRED
description CDATA #IMPLIED
- is_managed (true|1|false|0) 'true'
- restart_type (ignore|restart) 'ignore'
- multiple_active (stop_start|stop_only|block) 'stop_start'
- resource_stickiness (0|INFINITY|-INFINITY) '0'
- notify (true|1|false|0) 'false'
-
- globally_unique (true|1|false|0) 'true'
-
- ordered (true|1|false|0) 'true'
- interleave (true|1|false|0) 'false'>
+ is_managed (true|1|false|0) 'true'
+ restart_type (ignore|restart) 'ignore'
+ multiple_active (stop_start|stop_only|block) 'stop_start'
+ resource_stickiness (0|INFINITY|-INFINITY) '0'
+
+ notify (true|1|false|0) 'false'
+ globally_unique (true|1|false|0) 'true'
+ ordered (true|1|false|0) 'true'
+ interleave (true|1|false|0) 'false'>
<!-- Annotated version -->
<!ELEMENT instance_attributes (rule*, attributes)>
<!ATTLIST instance_attributes
id CDATA #REQUIRED
score CDATA #IMPLIED>
-
<!-- Annotated version -->
<!ELEMENT constraints (rsc_order|rsc_colocation|rsc_location)*>
@@ -140,10 +140,10 @@
<!ATTLIST rsc_order
id CDATA #REQUIRED
from CDATA #REQUIRED
- action (start|stop) 'start'
- type (before|after) 'after'
to CDATA #REQUIRED
- symetrical (true|1|false|0) 'true'>
+ action (start|stop) 'start'
+ type (before|after) 'after'
+ symetrical (true|1|false|0) 'true'>
<!-- Annotated version -->
<!ELEMENT rsc_colocation (lifetime?)>
@@ -165,11 +165,11 @@
<!ELEMENT rule (expression|time_expression|rule)+>
<!ATTLIST rule
- id CDATA #REQUIRED
- role CDATA #IMPLIED
- score CDATA #IMPLIED
- score_attribute CDATA #IMPLIED
- boolean_op (or|and) 'and'>
+ id CDATA #REQUIRED
+ role CDATA #IMPLIED
+ score CDATA #IMPLIED
+ score_attribute CDATA #IMPLIED
+ boolean_op (or|and) 'and'>
<!-- Annotated version -->
<!ELEMENT expression EMPTY>
@@ -222,12 +222,11 @@
join (pending|member|down) 'down'
expected (pending|member|down) 'down'
in_ccm (true|1|false|0) 'false'
- crm-debug-origin CDATA #IMPLIED
+ crm-debug-origin CDATA #IMPLIED
shutdown CDATA #IMPLIED
clear_shutdown CDATA #IMPLIED>
<!ELEMENT lrm (lrm_resources)>
<!ATTLIST lrm id CDATA #REQUIRED>
-
<!-- Annotated version -->
<!ELEMENT lrm_resources (lrm_resource*)>
@@ -251,12 +250,11 @@
op_digest CDATA #IMPLIED
interval CDATA #REQUIRED
transition_magic CDATA #REQUIRED>
-
<!ELEMENT nvpair EMPTY>
<!ATTLIST nvpair
- id CDATA #REQUIRED
- name CDATA #REQUIRED
- value CDATA #IMPLIED>
+ id CDATA #REQUIRED
+ name CDATA #REQUIRED
+ value CDATA #IMPLIED>
<!ELEMENT parameters EMPTY>
<!ELEMENT attributes (nvpair*)>
<!ELEMENT transient_attributes (instance_attributes*)>
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 100
*********************************************
