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 lars from ([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 29 Mar 2006 08:56:03 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/pengine/testcases
Modified Files:
master-6.xml
Log Message:
transient_attributes does have an id attribute.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-6.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- master-6.xml 27 Mar 2006 15:53:10 -0000 1.1
+++ master-6.xml 29 Mar 2006 15:56:02 -0000 1.2
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE cib SYSTEM "crm-1.0.dtd">
<cib cib_feature_revision="1" have_quorum="true" generated="true"
admin_epoch="0" ccm_transition="4" num_peers="4" crm_feature_set="1.0.4"
debug_source="create_node_entry" dc_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"
epoch="4" num_updates="167">
<configuration>
<crm_config>
@@ -257,7 +259,7 @@
</lrm_resource>
<lrm_resource id="heartbeat_192.168.100.182" type="IPaddr"
class="heartbeat" provider="heartbeat">
<lrm_rsc_op id="heartbeat_192.168.100.182_monitor_0"
operation="monitor" origin="build_active_RAs"
transition_key="0:b76c3e2e-f4d3-4800-af76-89ec8931503c"
transition_magic="4:7;0:b76c3e2e-f4d3-4800-af76-89ec8931503c"
rsc_state="monitor_failed" call_id="4" rc_code="7" op_status="4">
- <parameters 1="192.168.100.182" te-target-rc="7"
lrm-is-probe="true" crm_feature_set="1.0.4"/>
+ <parameters c_1="192.168.100.182" te-target-rc="7"
lrm-is-probe="true" crm_feature_set="1.0.4"/>
</lrm_rsc_op>
</lrm_resource>
<lrm_resource id="ocf_msdummy:0"
type="/usr/lib/heartbeat/cts/OCFMSDummy" class="ocf" provider="heartbeat">
@@ -378,10 +380,10 @@
</lrm_resource>
<lrm_resource id="heartbeat_192.168.100.182" type="IPaddr"
class="heartbeat" provider="heartbeat">
<lrm_rsc_op id="heartbeat_192.168.100.182_start_0"
operation="start" origin="build_active_RAs"
transition_key="7:b76c3e2e-f4d3-4800-af76-89ec8931503c"
transition_magic="0:0;7:b76c3e2e-f4d3-4800-af76-89ec8931503c"
rsc_state="running" call_id="31" rc_code="0" op_status="0">
- <parameters 1="192.168.100.182" crm_feature_set="1.0.4"/>
+ <parameters c_1="192.168.100.182" crm_feature_set="1.0.4"/>
</lrm_rsc_op>
<lrm_rsc_op id="heartbeat_192.168.100.182_monitor_5000"
operation="monitor" origin="build_active_RAs"
transition_key="7:b76c3e2e-f4d3-4800-af76-89ec8931503c"
transition_magic="0:0;7:b76c3e2e-f4d3-4800-af76-89ec8931503c"
rsc_state="running" call_id="35" rc_code="0" op_status="0">
- <parameters timeout="20000" 1="192.168.100.182"
crm_feature_set="1.0.4" interval="5000"/>
+ <parameters timeout="20000" c_1="192.168.100.182"
crm_feature_set="1.0.4" interval="5000"/>
</lrm_rsc_op>
</lrm_resource>
<lrm_resource id="ocf_msdummy:0"
type="/usr/lib/heartbeat/cts/OCFMSDummy" class="ocf" provider="heartbeat">
@@ -487,7 +489,7 @@
</lrm_resource>
<lrm_resource id="heartbeat_192.168.100.182" type="IPaddr"
class="heartbeat" provider="heartbeat">
<lrm_rsc_op id="heartbeat_192.168.100.182_monitor_0"
operation="monitor" origin="build_active_RAs"
transition_key="6:b76c3e2e-f4d3-4800-af76-89ec8931503c"
transition_magic="4:7;6:b76c3e2e-f4d3-4800-af76-89ec8931503c"
rsc_state="monitor_failed" call_id="4" rc_code="7" op_status="4">
- <parameters 1="192.168.100.182" te-target-rc="7"
lrm-is-probe="true" crm_feature_set="1.0.4"/>
+ <parameters c_1="192.168.100.182" te-target-rc="7"
lrm-is-probe="true" crm_feature_set="1.0.4"/>
</lrm_rsc_op>
</lrm_resource>
<lrm_resource id="ocf_msdummy:0"
type="/usr/lib/heartbeat/cts/OCFMSDummy" class="ocf" provider="heartbeat">
@@ -569,7 +571,7 @@
</lrm_resource>
<lrm_resource id="heartbeat_192.168.100.182" type="IPaddr"
class="heartbeat" provider="heartbeat">
<lrm_rsc_op id="heartbeat_192.168.100.182_monitor_0"
operation="monitor" origin="do_update_resource"
transition_key="8:b76c3e2e-f4d3-4800-af76-89ec8931503c"
transition_magic="4:7;8:b76c3e2e-f4d3-4800-af76-89ec8931503c"
rsc_state="monitor_failed" call_id="4" rc_code="7" op_status="4">
- <parameters 1="192.168.100.182" te-target-rc="7"
lrm-is-probe="true" crm_feature_set="1.0.4"/>
+ <parameters c_1="192.168.100.182" te-target-rc="7"
lrm-is-probe="true" crm_feature_set="1.0.4"/>
</lrm_rsc_op>
</lrm_resource>
<lrm_resource id="ocf_msdummy:1"
type="/usr/lib/heartbeat/cts/OCFMSDummy" class="ocf" provider="heartbeat">
------------------------------
Message: 2
Date: Wed, 29 Mar 2006 09:33:37 -0700 (MST)
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:
Various updates to reflect reality
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crm-1.0.dtd,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- crm-1.0.dtd 29 Mar 2006 15:56:02 -0000 1.49
+++ crm-1.0.dtd 29 Mar 2006 16:33:36 -0000 1.50
@@ -29,11 +29,16 @@
dc_uuid CDATA #IMPLIED
ccm_transition CDATA #REQUIRED
have_quorum (true|false) 'false'
- cib_feature_revision CDATA #REQUIRED>
-<!ELEMENT configuration (nodes, resources, constraints, crm_config)>
+ cib_feature_revision CDATA #REQUIRED
+ crm_feature_set CDATA #REQUIRED
+
+ generated CDATA #IMPLIED
+ debug_source CDATA #IMPLIED>
+
+<!ELEMENT configuration (crm_config, nodes, resources, constraints)>
<!-- Annotated version -->
-<!ELEMENT crm_config (cluster_property_set,nvpair)*>
+<!ELEMENT crm_config (cluster_property_set|nvpair)*>
<!ELEMENT cluster_property_set (rule*, attributes)>
<!ELEMENT nodes (node*)>
<!-- Annotated version -->
@@ -44,18 +49,18 @@
uname CDATA #REQUIRED
description CDATA #IMPLIED
type (normal|member|ping) #REQUIRED>
-<!ELEMENT resources (primitive*, group*, clone*)>
+<!ELEMENT resources (primitive|group|clone|master_slave)*>
<!-- Annotated version -->
<!ELEMENT primitive (operations?, instance_attributes*)>
<!ATTLIST primitive
id CDATA #REQUIRED
description CDATA #IMPLIED
- class (ocf|init|heartbeat|stonith) #REQUIRED
+ class (ocf|lsb|heartbeat|stonith) #REQUIRED
type CDATA #REQUIRED
provider CDATA #IMPLIED
- is_managed (true|false) 'true'
+ 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'
@@ -71,6 +76,7 @@
description CDATA #IMPLIED
interval CDATA #IMPLIED
timeout CDATA #IMPLIED
+ role (Master|Slave|Started|Stopped) 'Started'
prereq (nothing|quorum|fencing) #IMPLIED
on_fail (nothing|block|stop|fence) #IMPLIED>
<!-- Annotated version -->
@@ -89,7 +95,7 @@
ordered (true|false) 'true'
collocated (true|false) 'true'>
-<!ELEMENT clone (primitive?,group?,instance_attributes*)>
+<!ELEMENT clone (instance_attributes*, (primitive|group))>
<!ATTLIST clone
id CDATA #REQUIRED
description CDATA #IMPLIED
@@ -106,7 +112,7 @@
ordered (true|false) 'true'
interleave (true|false) 'false'>
-<!ELEMENT master_slave (clone, instance_attributes*)>
+<!ELEMENT master_slave (instance_attributes*, (primitive|group))>
<!ATTLIST master_slave
id CDATA #REQUIRED
description CDATA #IMPLIED
@@ -122,12 +128,11 @@
globally_unique (true|false) 'true'
ordered (true|false) 'true'
- interleave (true|false) 'false'
- max_masters CDATA #REQUIRED
- max_node_masters CDATA #REQUIRED>
+ interleave (true|false) 'false'>
<!-- Annotated version -->
<!ELEMENT instance_attributes (rule*, attributes)>
+<!ATTLIST instance_attributes id CDATA #IMPLIED>
<!-- Annotated version -->
<!ELEMENT constraints (rsc_order*, rsc_colocation*, rsc_location*)>
@@ -204,7 +209,7 @@
<!-- Annotated version -->
<!ELEMENT status (node_state*)>
-<!ELEMENT node_state (lrm, transient_attributes)>
+<!ELEMENT node_state ((transient_attributes|lrm), (transient_attributes|lrm)) >
<!ATTLIST node_state
id CDATA #REQUIRED
uname CDATA #REQUIRED
@@ -215,20 +220,17 @@
shutdown CDATA #IMPLIED
timestamp CDATA #IMPLIED>
<!ELEMENT lrm (lrm_resources)>
-<!ATTLIST lrm
- id CDATA #REQUIRED
- version CDATA #REQUIRED>
<!-- Annotated version -->
<!ELEMENT lrm_resources (lrm_resource*)>
-<!ELEMENT lrm_resource (lrm_rsc_op)>
+<!ELEMENT lrm_resource (lrm_rsc_op*)>
<!ATTLIST lrm_resource
id CDATA #REQUIRED
- class (ocf|init|heartbeat|stonith) #REQUIRED
+ class (lsb|ocf|heartbeat|stonith) #REQUIRED
type CDATA #REQUIRED
provider CDATA #IMPLIED>
-<!ELEMENT lrm_rsc_op (parameters)>
+<!ELEMENT lrm_rsc_op (parameters?)>
<!ATTLIST lrm_rsc_op
id CDATA #REQUIRED
operation CDATA #REQUIRED
@@ -238,10 +240,15 @@
rsc_state CDATA #IMPLIED
transition_key CDATA #IMPLIED
transition_magic CDATA #REQUIRED>
-<!ELEMENT parameters (nvpair*)>
+<!ELEMENT nvpair EMPTY>
+<!ATTLIST nvpair
+ id CDATA #REQUIRED
+ name CDATA #REQUIRED
+ value CDATA #IMPLIED>
+<!ELEMENT parameters EMPTY>
+<!ELEMENT attributes (nvpair*)>
<!ELEMENT transient_attributes (instance_attributes*)>
-<!ATTLIST transient_attributes
- id CDATA #REQUIRED>
+<!ATTLIST transient_attributes id CDATA #IMPLIED>
<!-- ============================================================== -->
<!-- ============================================================== -->
@@ -355,18 +362,3 @@
part (src|dst) #REQUIRED
subsystem (dc|crmd|dcib|cib|pe|te|lrm|admin) #REQUIRED
host CDATA #IMPLIED>
-
-<!-- ============================================================== -->
-<!-- ============================================================== -->
-<!-- Common elements -->
-
-<!ELEMENT nvpair EMPTY>
-<!-- No, you don't /have/ to give a value. There's a difference between
- a key not being present and a key not having a value. -->
-<!ATTLIST nvpair
- id CDATA #REQUIRED
- name CDATA #REQUIRED
- value CDATA #IMPLIED>
-
-<!ELEMENT attributes (nvpair*)>
-
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 28, Issue 82
********************************************
