Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
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: linux-ha by sunjd from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Sun, 2 Jul 2006 23:47:08 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
bug1055: tweak package dependencies
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.532
retrieving revision 1.533
diff -u -3 -r1.532 -r1.533
--- configure.in 26 Jun 2006 16:19:09 -0000 1.532
+++ configure.in 3 Jul 2006 05:47:08 -0000 1.533
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.532 $) dnl cvs revision
+AC_REVISION($Revision: 1.533 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -2370,7 +2370,12 @@
AM_CONDITIONAL(MGMT_BUILD, test "x${enable_mgmt}" != "xno")
if test "x${enable_mgmt}" != "xno"; then
AC_DEFINE_UNQUOTED(MGMT_ENABLED, 1, Define to 1 if the mgmt is enabled.)
- MGMT_RUNTIME_REQUIRES="libglade2, python-gtk"
+dnl FIXME: a flawy solution but no better one now
+ if rpm -q python-gtk > /dev/null; then
+ MGMT_RUNTIME_REQUIRES="libglade2, python-gtk";
+ else
+ MGMT_RUNTIME_REQUIRES="libglade2, pygtk2";
+ fi
else
MGMT_RUNTIME_REQUIRES=
fi
------------------------------
Message: 2
Date: Mon, 3 Jul 2006 05:47:39 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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/pengine/testcases
Added Files:
group13.dot group13.exp group13.xml
Log Message:
OSDL #1356: Group colocation fixes when one group cant run anywhere
------------------------------
Message: 3
Date: Mon, 3 Jul 2006 05:47:39 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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/pengine
Modified Files:
group.c native.c regression.sh
Log Message:
OSDL #1356: Group colocation fixes when one group cant run anywhere
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/group.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- group.c 22 Jun 2006 13:32:58 -0000 1.67
+++ group.c 3 Jul 2006 11:47:38 -0000 1.68
@@ -1,4 +1,4 @@
-/* $Id: group.c,v 1.67 2006/06/22 13:32:58 andrew Exp $ */
+/* $Id: group.c,v 1.68 2006/07/03 11:47:38 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -89,6 +89,13 @@
crm_debug_3("Coloring children of: %s", rsc->id);
slist_iter(
+ coloc, rsc_colocation_t, rsc->rsc_cons, lpc,
+ crm_debug_3("Pre-Processing %s for %s", coloc->id, rsc->id);
+ group_data->first_child->cmds->rsc_colocation_lh(
+ group_data->first_child, coloc->rsc_rh, coloc);
+ );
+
+ slist_iter(
child_rsc, resource_t, group_data->child_list, lpc,
group_color = child_rsc->cmds->color(child_rsc, data_set);
CRM_CHECK(group_color != NULL, continue);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -3 -r1.154 -r1.155
--- native.c 22 Jun 2006 13:33:34 -0000 1.154
+++ native.c 3 Jul 2006 11:47:38 -0000 1.155
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.154 2006/06/22 13:33:34 andrew Exp $ */
+/* $Id: native.c,v 1.155 2006/07/03 11:47:38 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -209,6 +209,8 @@
new_color = create_color(data_set, rsc,
rsc->allowed_nodes);
native_assign_color(rsc, new_color);
+ crm_debug_3("Colored resource %s with new color %d",
+ rsc->id, rsc->color->id);
}
if(new_color == NULL) {
@@ -229,7 +231,7 @@
rsc, constraint->rsc_rh, constraint);
);
#endif
- print_resource(LOG_DEBUG_3, "Colored", rsc, TRUE);
+ print_resource(LOG_DEBUG_3, "Colored ", rsc, TRUE);
return new_color;
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/regression.sh,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- regression.sh 21 Jun 2006 14:48:01 -0000 1.89
+++ regression.sh 3 Jul 2006 11:47:38 -0000 1.90
@@ -162,6 +162,7 @@
do_test group5 "Group + Native (move) "
do_test group6 "Group + Group (move) "
do_test group7 "Group colocation"
+do_test group13 "Group colocation (cant run)"
do_test group8 "Group anti-colocation"
do_test group9 "Group recovery"
do_test group10 "Group partial recovery"
------------------------------
Message: 4
Date: Mon, 3 Jul 2006 05:50:51 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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/pengine/testcases
Modified Files:
594.exp 662.exp 696.exp 726.exp 735.exp 764.exp 797.exp
829.exp group10.exp group11.exp inc10.exp managed-2.exp
master-7.exp master-8.exp master-9.exp params-1.exp
rec-node-13.exp rsc_dep4.exp simple6.exp standby.exp
target-1.exp
Log Message:
Update regression tests: dont send resource parameters for a stop
- use the ones that the LRM has cached
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/594.exp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- 594.exp 22 Jun 2006 16:23:29 -0000 1.31
+++ 594.exp 3 Jul 2006 11:50:49 -0000 1.32
@@ -12,7 +12,7 @@
<action_set>
<rsc_op id="16" operation="stop" operation_key="DcIPaddr_stop_0"
on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
<primitive id="DcIPaddr" long-id="DcIPaddr" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="127.0.0.10"
CRM_meta_timeout="60000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="60000"/>
</rsc_op>
</action_set>
<inputs/>
@@ -68,7 +68,7 @@
<action_set>
<rsc_op id="21" operation="stop" operation_key="rsc_hadev2_stop_0"
on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
<primitive id="rsc_hadev2" long-id="rsc_hadev2" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="127.0.0.22"
CRM_meta_timeout="60000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="60000"/>
</rsc_op>
</action_set>
<inputs/>
@@ -115,7 +115,7 @@
<action_set>
<rsc_op id="26" operation="stop"
operation_key="child_DoFencing:0_stop_0" on_node="hadev2"
on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
<primitive id="child_DoFencing:0"
long-id="DoFencing:child_DoFencing:0" class="stonith" type="ssh"/>
- <attributes crm_feature_set="1.0.6" hostlist="hadev3 hadev2 hadev1 "
CRM_meta_timeout="60000" CRM_meta_clone="0" CRM_meta_clone_max="3"
CRM_meta_clone_node_max="1"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="60000"
CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1"/>
</rsc_op>
</action_set>
<inputs>
@@ -137,7 +137,7 @@
<action_set>
<rsc_op id="29" operation="stop"
operation_key="child_DoFencing:2_stop_0" on_node="hadev1"
on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
<primitive id="child_DoFencing:2"
long-id="DoFencing:child_DoFencing:2" class="stonith" type="ssh"/>
- <attributes crm_feature_set="1.0.6" hostlist="hadev3 hadev2 hadev1 "
CRM_meta_timeout="60000" CRM_meta_clone="2" CRM_meta_clone_max="3"
CRM_meta_clone_node_max="1"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="60000"
CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1"/>
</rsc_op>
</action_set>
<inputs>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/662.exp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- 662.exp 22 Jun 2006 16:23:29 -0000 1.30
+++ 662.exp 3 Jul 2006 11:50:49 -0000 1.31
@@ -84,7 +84,7 @@
<action_set>
<rsc_op id="42" operation="stop" operation_key="rsc_c001n02_stop_0"
on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<primitive id="rsc_c001n02" long-id="rsc_c001n02" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="127.0.0.12"
CRM_meta_timeout="120000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="120000"/>
</rsc_op>
</action_set>
<inputs/>
@@ -185,7 +185,7 @@
<action_set>
<rsc_op id="49" operation="stop"
operation_key="child_DoFencing:0_stop_0" on_node="c001n02"
on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<primitive id="child_DoFencing:0"
long-id="DoFencing:child_DoFencing:0" class="stonith" type="ssh"/>
- <attributes crm_feature_set="1.0.6" hostlist="c001n09 c001n02 c001n03
c001n04 " CRM_meta_timeout="120000" CRM_meta_clone="0" CRM_meta_clone_max="4"
CRM_meta_clone_node_max="1"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="120000"
CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
</rsc_op>
</action_set>
<inputs>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/696.exp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- 696.exp 22 Jun 2006 16:23:29 -0000 1.25
+++ 696.exp 3 Jul 2006 11:50:49 -0000 1.26
@@ -65,7 +65,7 @@
<action_set>
<rsc_op id="22" operation="stop" operation_key="rsc_hadev1_stop_0"
on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
<primitive id="rsc_hadev1" long-id="rsc_hadev1" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="10.0.0.11"
CRM_meta_timeout="120000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="120000"/>
</rsc_op>
</action_set>
<inputs/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/726.exp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- 726.exp 22 Jun 2006 16:23:29 -0000 1.24
+++ 726.exp 3 Jul 2006 11:50:49 -0000 1.25
@@ -128,7 +128,7 @@
<action_set>
<rsc_op id="41" operation="stop" operation_key="rsc_ibm1_stop_0"
on_node="test03" on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a">
<primitive id="rsc_ibm1" long-id="rsc_ibm1" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="127.0.0.12"
CRM_meta_timeout="120000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="120000"/>
</rsc_op>
</action_set>
<inputs/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/735.exp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- 735.exp 22 Jun 2006 16:23:30 -0000 1.28
+++ 735.exp 3 Jul 2006 11:50:49 -0000 1.29
@@ -12,7 +12,7 @@
<action_set>
<rsc_op id="12" operation="stop" operation_key="rsc_hadev1_stop_0"
on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
<primitive id="rsc_hadev1" long-id="rsc_hadev1" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="127.0.0.11"
CRM_meta_timeout="120000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="120000"/>
</rsc_op>
</action_set>
<inputs/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/764.exp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- 764.exp 22 Jun 2006 16:23:30 -0000 1.25
+++ 764.exp 3 Jul 2006 11:50:49 -0000 1.26
@@ -12,7 +12,7 @@
<action_set>
<rsc_op id="15" operation="stop" operation_key="DcIPaddr_stop_0"
on_node="posic043" on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596">
<primitive id="DcIPaddr" long-id="DcIPaddr" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="127.0.0.10"
CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</rsc_op>
</action_set>
<inputs/>
@@ -30,7 +30,7 @@
<action_set>
<rsc_op id="17" operation="stop" operation_key="rsc_posic041_stop_0"
on_node="posic041" on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad">
<primitive id="rsc_posic041" long-id="rsc_posic041" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="127.0.0.11"
CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</rsc_op>
</action_set>
<inputs/>
@@ -48,7 +48,7 @@
<action_set>
<rsc_op id="19" operation="stop" operation_key="rsc_posic042_stop_0"
on_node="posic041" on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad">
<primitive id="rsc_posic042" long-id="rsc_posic042" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="127.0.0.12"
CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</rsc_op>
</action_set>
<inputs/>
@@ -66,7 +66,7 @@
<action_set>
<rsc_op id="21" operation="stop" operation_key="rsc_posic043_stop_0"
on_node="posic043" on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596">
<primitive id="rsc_posic043" long-id="rsc_posic043" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="127.0.0.13"
CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</rsc_op>
</action_set>
<inputs/>
@@ -84,7 +84,7 @@
<action_set>
<rsc_op id="24" operation="stop" operation_key="rsc_posic044_stop_0"
on_node="posic041" on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad">
<primitive id="rsc_posic044" long-id="rsc_posic044" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="127.0.0.14"
CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</rsc_op>
</action_set>
<inputs/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/797.exp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- 797.exp 22 Jun 2006 16:23:30 -0000 1.26
+++ 797.exp 3 Jul 2006 11:50:49 -0000 1.27
@@ -21,7 +21,7 @@
<action_set>
<rsc_op id="26" operation="stop" operation_key="DcIPaddr_stop_0"
on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<primitive id="DcIPaddr" long-id="DcIPaddr" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="127.0.0.10"
CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</rsc_op>
</action_set>
<inputs/>
@@ -61,7 +61,7 @@
<action_set>
<rsc_op id="30" operation="stop" operation_key="rsc_c001n08_stop_0"
on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<primitive id="rsc_c001n08" long-id="rsc_c001n08" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="127.0.0.11"
CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</rsc_op>
</action_set>
<inputs/>
@@ -88,7 +88,7 @@
<action_set>
<rsc_op id="33" operation="stop" operation_key="rsc_c001n02_stop_0"
on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<primitive id="rsc_c001n02" long-id="rsc_c001n02" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="127.0.0.12"
CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</rsc_op>
</action_set>
<inputs/>
@@ -115,7 +115,7 @@
<action_set>
<rsc_op id="36" operation="stop" operation_key="rsc_c001n03_stop_0"
on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<primitive id="rsc_c001n03" long-id="rsc_c001n03" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="127.0.0.13"
CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</rsc_op>
</action_set>
<inputs/>
@@ -133,7 +133,7 @@
<action_set>
<rsc_op id="38" operation="stop" operation_key="rsc_c001n01_stop_0"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<primitive id="rsc_c001n01" long-id="rsc_c001n01" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="127.0.0.14"
CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</rsc_op>
</action_set>
<inputs/>
@@ -155,7 +155,7 @@
<action_set>
<rsc_op id="40" operation="stop"
operation_key="child_DoFencing:0_stop_0" on_node="c001n01"
on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<primitive id="child_DoFencing:0"
long-id="DoFencing:child_DoFencing:0" class="stonith" type="ssh"/>
- <attributes crm_feature_set="1.0.6" hostlist="c001n08 c001n02 c001n03
c001n01 " CRM_meta_timeout="180000" CRM_meta_clone="0" CRM_meta_clone_max="4"
CRM_meta_clone_node_max="1"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"
CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
</rsc_op>
</action_set>
<inputs>
@@ -168,7 +168,7 @@
<action_set>
<rsc_op id="41" operation="stop"
operation_key="child_DoFencing:0_stop_0" on_node="c001n03"
on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<primitive id="child_DoFencing:0"
long-id="DoFencing:child_DoFencing:0" class="stonith" type="ssh"/>
- <attributes crm_feature_set="1.0.6" hostlist="c001n08 c001n02 c001n03
c001n01 " CRM_meta_timeout="180000" CRM_meta_clone="0" CRM_meta_clone_max="4"
CRM_meta_clone_node_max="1"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"
CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
</rsc_op>
</action_set>
<inputs>
@@ -200,7 +200,7 @@
<action_set>
<rsc_op id="43" operation="stop"
operation_key="child_DoFencing:1_stop_0" on_node="c001n02"
on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<primitive id="child_DoFencing:1"
long-id="DoFencing:child_DoFencing:1" class="stonith" type="ssh"/>
- <attributes crm_feature_set="1.0.6" hostlist="c001n08 c001n02 c001n03
c001n01 " CRM_meta_timeout="180000" CRM_meta_clone="1" CRM_meta_clone_max="4"
CRM_meta_clone_node_max="1"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"
CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
</rsc_op>
</action_set>
<inputs>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/829.exp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- 829.exp 22 Jun 2006 16:23:30 -0000 1.26
+++ 829.exp 3 Jul 2006 11:50:49 -0000 1.27
@@ -65,7 +65,7 @@
<synapse id="7">
<action_set>
<pseudo_event id="33" operation="stop"
operation_key="rsc_c001n02_stop_0">
- <attributes crm_feature_set="1.0.6" ip="127.0.0.12"
CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</pseudo_event>
</action_set>
<inputs>
@@ -151,7 +151,7 @@
<synapse id="15">
<action_set>
<pseudo_event id="40" operation="stop"
operation_key="child_DoFencing:0_stop_0">
- <attributes crm_feature_set="1.0.6" hostlist="c001n08 c001n02 c001n03
c001n01 " CRM_meta_timeout="180000" CRM_meta_clone="0" CRM_meta_clone_max="4"
CRM_meta_clone_node_max="1"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"
CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
</pseudo_event>
</action_set>
<inputs>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/group10.exp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- group10.exp 22 Jun 2006 16:23:30 -0000 1.12
+++ group10.exp 3 Jul 2006 11:50:49 -0000 1.13
@@ -69,7 +69,7 @@
<action_set>
<rsc_op id="13" operation="stop"
operation_key="child_192.168.100.181_stop_0" on_node="c001n01"
on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<primitive id="child_192.168.100.181"
long-id="group-1:child_192.168.100.181" class="ocf" provider="heartbeat"
type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="192.168.100.181"
CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</rsc_op>
</action_set>
<inputs>
@@ -111,7 +111,7 @@
<action_set>
<rsc_op id="31" operation="stop"
operation_key="child_192.168.100.182_stop_0" on_node="c001n01"
on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<primitive id="child_192.168.100.182"
long-id="group-1:child_192.168.100.182" class="ocf" provider="heartbeat"
type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="192.168.100.182"
CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</rsc_op>
</action_set>
<inputs>
@@ -153,7 +153,7 @@
<action_set>
<rsc_op id="33" operation="stop"
operation_key="child_192.168.100.183_stop_0" on_node="c001n01"
on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<primitive id="child_192.168.100.183"
long-id="group-1:child_192.168.100.183" class="ocf" provider="heartbeat"
type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="192.168.100.183"
CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</rsc_op>
</action_set>
<inputs>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/group11.exp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- group11.exp 22 Jun 2006 16:23:30 -0000 1.3
+++ group11.exp 3 Jul 2006 11:50:49 -0000 1.4
@@ -26,7 +26,7 @@
<action_set>
<rsc_op id="3" operation="stop" operation_key="rsc1_stop_0"
on_node="node1" on_node_uuid="uuid1">
<primitive id="rsc1" long-id="1:rsc1" class="heartbeat"
type="apache"/>
- <attributes crm_feature_set="1.0.6" target_role="started"
CRM_meta_timeout="60000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="60000"/>
</rsc_op>
</action_set>
<inputs>
@@ -39,7 +39,7 @@
<action_set>
<rsc_op id="4" operation="stop" operation_key="rsc2_stop_0"
on_node="node1" on_node_uuid="uuid1">
<primitive id="rsc2" long-id="1:rsc2" class="heartbeat"
type="apache"/>
- <attributes crm_feature_set="1.0.6" target_role="Stopped"
CRM_meta_timeout="60000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="60000"/>
</rsc_op>
</action_set>
<inputs>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/inc10.exp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- inc10.exp 22 Jun 2006 16:23:30 -0000 1.3
+++ inc10.exp 3 Jul 2006 11:50:49 -0000 1.4
@@ -3,7 +3,7 @@
<action_set>
<rsc_op id="16" operation="stop"
operation_key="child_DoFencing:2_stop_0" on_node="xen-2"
on_node_uuid="e3aa8547-3d52-47df-a8a3-ca94538a5282">
<primitive id="child_DoFencing:2"
long-id="DoFencing:child_DoFencing:2" class="stonith" provider="heartbeat"
type="null"/>
- <attributes crm_feature_set="1.0.6"
hostlist="xen-1,xen-2,xen-3,xen-4" CRM_meta_timeout="60000"
CRM_meta_globally_unique="false" CRM_meta_clone="2" CRM_meta_clone_max="4"
CRM_meta_clone_node_max="1"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="60000"
CRM_meta_globally_unique="false" CRM_meta_clone="2" CRM_meta_clone_max="4"
CRM_meta_clone_node_max="1"/>
</rsc_op>
</action_set>
<inputs>
@@ -91,7 +91,7 @@
<action_set>
<rsc_op id="27" operation="stop" operation_key="ocfs2:1_stop_0"
internal_operation_key="ocfs2:2_stop_0" on_node="xen-2"
on_node_uuid="e3aa8547-3d52-47df-a8a3-ca94538a5282">
<primitive id="ocfs2:1" long-id="ocfs2:2" class="ocf"
provider="heartbeat" type="Filesystem"/>
- <attributes crm_feature_set="1.0.6" directory="/mnt/share1"
fstype="ocfs2" device="/dev/hdb1" CRM_meta_notify_active_resource="ocfs2:0
ocfs2:1 ocfs2:3 " CRM_meta_notify_stop_uname="xen-2 " CRM_meta_timeout="60000"
CRM_meta_notify_stop_resource="ocfs2:2 " CRM_meta_notify_active_uname="xen-4
xen-3 xen-1 " CRM_meta_globally_unique="false" CRM_meta_clone="2"
CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
+ <attributes crm_feature_set="1.0.6"
CRM_meta_notify_active_resource="ocfs2:0 ocfs2:1 ocfs2:3 "
CRM_meta_notify_stop_uname="xen-2 " CRM_meta_timeout="60000"
CRM_meta_notify_stop_resource="ocfs2:2 " CRM_meta_notify_active_uname="xen-4
xen-3 xen-1 " CRM_meta_globally_unique="false" CRM_meta_clone="2"
CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
</rsc_op>
</action_set>
<inputs>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/managed-2.exp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- managed-2.exp 22 Jun 2006 16:23:31 -0000 1.29
+++ managed-2.exp 3 Jul 2006 11:50:49 -0000 1.30
@@ -120,7 +120,7 @@
<action_set>
<rsc_op id="136" operation="stop" operation_key="rsc_c001n09_stop_0"
on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4">
<primitive id="rsc_c001n09" long-id="rsc_c001n09" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="127.0.0.11"
CRM_meta_timeout="120000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="120000"/>
</rsc_op>
</action_set>
<inputs/>
@@ -174,7 +174,7 @@
<action_set>
<rsc_op id="137" operation="stop" operation_key="rsc_c001n02_stop_0"
on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<primitive id="rsc_c001n02" long-id="rsc_c001n02" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="127.0.0.12"
CRM_meta_timeout="120000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="120000"/>
</rsc_op>
</action_set>
<inputs/>
@@ -237,7 +237,7 @@
<action_set>
<rsc_op id="138" operation="stop" operation_key="rsc_c001n03_stop_0"
on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<primitive id="rsc_c001n03" long-id="rsc_c001n03" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="127.0.0.13"
CRM_meta_timeout="120000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="120000"/>
</rsc_op>
</action_set>
<inputs/>
@@ -300,7 +300,7 @@
<action_set>
<rsc_op id="139" operation="stop" operation_key="rsc_c001n04_stop_0"
on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
<primitive id="rsc_c001n04" long-id="rsc_c001n04" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="127.0.0.14"
CRM_meta_timeout="120000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="120000"/>
</rsc_op>
</action_set>
<inputs/>
@@ -372,7 +372,7 @@
<action_set>
<rsc_op id="140" operation="stop" operation_key="rsc_c001n05_stop_0"
on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5">
<primitive id="rsc_c001n05" long-id="rsc_c001n05" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="127.0.0.15"
CRM_meta_timeout="120000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="120000"/>
</rsc_op>
</action_set>
<inputs/>
@@ -435,7 +435,7 @@
<action_set>
<rsc_op id="141" operation="stop" operation_key="rsc_c001n06_stop_0"
on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2">
<primitive id="rsc_c001n06" long-id="rsc_c001n06" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="127.0.0.16"
CRM_meta_timeout="120000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="120000"/>
</rsc_op>
</action_set>
<inputs/>
@@ -489,7 +489,7 @@
<action_set>
<rsc_op id="142" operation="stop" operation_key="rsc_c001n07_stop_0"
on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b">
<primitive id="rsc_c001n07" long-id="rsc_c001n07" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="127.0.0.17"
CRM_meta_timeout="120000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="120000"/>
</rsc_op>
</action_set>
<inputs/>
@@ -525,7 +525,7 @@
<action_set>
<rsc_op id="143" operation="stop" operation_key="rsc_c001n08_stop_0"
on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<primitive id="rsc_c001n08" long-id="rsc_c001n08" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="127.0.0.18"
CRM_meta_timeout="120000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="120000"/>
</rsc_op>
</action_set>
<inputs/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-7.exp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- master-7.exp 22 Jun 2006 16:23:31 -0000 1.10
+++ master-7.exp 3 Jul 2006 11:50:49 -0000 1.11
@@ -2,7 +2,7 @@
<synapse id="0">
<action_set>
<pseudo_event id="34" operation="stop" operation_key="DcIPaddr_stop_0">
- <attributes crm_feature_set="1.0.6" ip="192.168.100.180"
CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</pseudo_event>
</action_set>
<inputs>
@@ -94,7 +94,7 @@
<action_set>
<rsc_op id="37" operation="stop"
operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03"
on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<primitive id="ocf_192.168.100.181"
long-id="group-1:ocf_192.168.100.181" class="ocf" provider="heartbeat"
type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="192.168.100.181"
CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</rsc_op>
</action_set>
<inputs>
@@ -136,7 +136,7 @@
<action_set>
<rsc_op id="40" operation="stop"
operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03"
on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<primitive id="heartbeat_192.168.100.182"
long-id="group-1:heartbeat_192.168.100.182" class="heartbeat"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" 1="192.168.100.182"
CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</rsc_op>
</action_set>
<inputs>
@@ -178,7 +178,7 @@
<action_set>
<rsc_op id="43" operation="stop"
operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03"
on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<primitive id="ocf_192.168.100.183"
long-id="group-1:ocf_192.168.100.183" class="ocf" provider="heartbeat"
type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="192.168.100.183"
CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</rsc_op>
</action_set>
<inputs>
@@ -254,7 +254,7 @@
<synapse id="19">
<action_set>
<pseudo_event id="53" operation="stop"
operation_key="rsc_c001n01_stop_0">
- <attributes crm_feature_set="1.0.6" ip="192.168.100.184"
CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</pseudo_event>
</action_set>
<inputs>
@@ -292,7 +292,7 @@
<synapse id="22">
<action_set>
<pseudo_event id="62" operation="stop"
operation_key="child_DoFencing:0_stop_0">
- <attributes crm_feature_set="1.0.6" hostlist="c001n01 c001n08 c001n02
c001n03 " CRM_meta_timeout="180000" CRM_meta_clone="0" CRM_meta_clone_max="4"
CRM_meta_clone_node_max="1"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"
CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
</pseudo_event>
</action_set>
<inputs>
@@ -435,7 +435,7 @@
<synapse id="36">
<action_set>
<pseudo_event id="86" operation="stop"
operation_key="ocf_msdummy:0_stop_0">
- <attributes crm_feature_set="1.0.6" CRM_meta_role="Stopped"
logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true"
CRM_meta_timeout="180000" CRM_meta_clone="0" CRM_meta_clone_max="8"
CRM_meta_clone_node_max="2" CRM_meta_master_max="4"
CRM_meta_master_node_max="1"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"
CRM_meta_clone="0" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2"
CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
</pseudo_event>
</action_set>
<inputs>
@@ -480,7 +480,7 @@
<synapse id="40">
<action_set>
<pseudo_event id="87" operation="stop"
operation_key="ocf_msdummy:4_stop_0">
- <attributes crm_feature_set="1.0.6" CRM_meta_role="Stopped"
logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true"
CRM_meta_timeout="180000" CRM_meta_clone="4" CRM_meta_clone_max="8"
CRM_meta_clone_node_max="2" CRM_meta_master_max="4"
CRM_meta_master_node_max="1"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"
CRM_meta_clone="4" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2"
CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
</pseudo_event>
</action_set>
<inputs>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-8.exp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- master-8.exp 22 Jun 2006 16:23:31 -0000 1.11
+++ master-8.exp 3 Jul 2006 11:50:49 -0000 1.12
@@ -2,7 +2,7 @@
<synapse id="0">
<action_set>
<pseudo_event id="34" operation="stop" operation_key="DcIPaddr_stop_0">
- <attributes crm_feature_set="1.0.6" ip="192.168.100.180"
CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</pseudo_event>
</action_set>
<inputs>
@@ -94,7 +94,7 @@
<action_set>
<rsc_op id="37" operation="stop"
operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03"
on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<primitive id="ocf_192.168.100.181"
long-id="group-1:ocf_192.168.100.181" class="ocf" provider="heartbeat"
type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="192.168.100.181"
CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</rsc_op>
</action_set>
<inputs>
@@ -136,7 +136,7 @@
<action_set>
<rsc_op id="40" operation="stop"
operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03"
on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<primitive id="heartbeat_192.168.100.182"
long-id="group-1:heartbeat_192.168.100.182" class="heartbeat"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" 1="192.168.100.182"
CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</rsc_op>
</action_set>
<inputs>
@@ -178,7 +178,7 @@
<action_set>
<rsc_op id="43" operation="stop"
operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03"
on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<primitive id="ocf_192.168.100.183"
long-id="group-1:ocf_192.168.100.183" class="ocf" provider="heartbeat"
type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="192.168.100.183"
CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</rsc_op>
</action_set>
<inputs>
@@ -254,7 +254,7 @@
<synapse id="19">
<action_set>
<pseudo_event id="53" operation="stop"
operation_key="rsc_c001n01_stop_0">
- <attributes crm_feature_set="1.0.6" ip="192.168.100.184"
CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</pseudo_event>
</action_set>
<inputs>
@@ -292,7 +292,7 @@
<synapse id="22">
<action_set>
<pseudo_event id="62" operation="stop"
operation_key="child_DoFencing:0_stop_0">
- <attributes crm_feature_set="1.0.6" hostlist="c001n01 c001n08 c001n02
c001n03 " CRM_meta_timeout="180000" CRM_meta_clone="0" CRM_meta_clone_max="4"
CRM_meta_clone_node_max="1"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"
CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
</pseudo_event>
</action_set>
<inputs>
@@ -366,7 +366,7 @@
<synapse id="29">
<action_set>
<pseudo_event id="73" operation="stop"
operation_key="ocf_msdummy:0_stop_0">
- <attributes crm_feature_set="1.0.6" CRM_meta_role="Slave"
logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true"
CRM_meta_timeout="180000" CRM_meta_clone="0" CRM_meta_clone_max="8"
CRM_meta_clone_node_max="2" CRM_meta_master_max="4"
CRM_meta_master_node_max="1"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"
CRM_meta_clone="0" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2"
CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
</pseudo_event>
</action_set>
<inputs>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-9.exp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- master-9.exp 22 Jun 2006 16:23:31 -0000 1.10
+++ master-9.exp 3 Jul 2006 11:50:49 -0000 1.11
@@ -12,7 +12,7 @@
<action_set>
<rsc_op id="47" operation="stop"
operation_key="child_DoFencing:1_stop_0" on_node="ibm1"
on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638">
<primitive id="child_DoFencing:1"
long-id="DoFencing:child_DoFencing:1" class="stonith" type="ssh"/>
- <attributes crm_feature_set="1.0.6" hostlist="sgi2 ibm1 va1 test02 "
CRM_meta_timeout="180000" CRM_meta_clone="1" CRM_meta_clone_max="4"
CRM_meta_clone_node_max="1"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"
CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
</rsc_op>
</action_set>
<inputs>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/params-1.exp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- params-1.exp 22 Jun 2006 16:23:31 -0000 1.13
+++ params-1.exp 3 Jul 2006 11:50:49 -0000 1.14
@@ -59,7 +59,7 @@
<action_set>
<rsc_op id="28" operation="stop" operation_key="DcIPaddr_stop_0"
on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<primitive id="DcIPaddr" long-id="DcIPaddr" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="127.0.0.20"
CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</rsc_op>
</action_set>
<inputs/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-13.exp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- rec-node-13.exp 22 Jun 2006 16:23:31 -0000 1.2
+++ rec-node-13.exp 3 Jul 2006 11:50:49 -0000 1.3
@@ -2,7 +2,7 @@
<synapse id="0">
<action_set>
<pseudo_event id="2" operation="stop"
operation_key="ocf_msdummy:6_stop_0">
- <attributes crm_feature_set="1.0.6" CRM_meta_role="Stopped"
logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true"
CRM_meta_timeout="180000" CRM_meta_clone="6" CRM_meta_clone_max="12"
CRM_meta_clone_node_max="2" CRM_meta_master_max="6"
CRM_meta_master_node_max="1"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"
CRM_meta_clone="6" CRM_meta_clone_max="12" CRM_meta_clone_node_max="2"
CRM_meta_master_max="6" CRM_meta_master_node_max="1"/>
</pseudo_event>
</action_set>
<inputs>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rsc_dep4.exp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- rsc_dep4.exp 22 Jun 2006 16:23:31 -0000 1.21
+++ rsc_dep4.exp 3 Jul 2006 11:50:49 -0000 1.22
@@ -43,7 +43,7 @@
<action_set>
<rsc_op id="11" operation="stop" operation_key="rsc4_stop_0"
on_node="node1" on_node_uuid="node1">
<primitive id="rsc4" long-id="rsc4" class="heartbeat" type="apache"/>
- <attributes crm_feature_set="1.0.6" priority="2.0"
CRM_meta_timeout="60000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="60000"/>
</rsc_op>
</action_set>
<inputs/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/simple6.exp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- simple6.exp 22 Jun 2006 16:23:32 -0000 1.32
+++ simple6.exp 3 Jul 2006 11:50:49 -0000 1.33
@@ -25,7 +25,7 @@
<action_set>
<rsc_op id="5" operation="stop" operation_key="rsc1_stop_0"
on_node="node1" on_node_uuid="node1">
<primitive id="rsc1" long-id="rsc1" class="heartbeat" type="apache"/>
- <attributes crm_feature_set="1.0.6" priority="1.0"
CRM_meta_timeout="60000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="60000"/>
</rsc_op>
</action_set>
<inputs/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/standby.exp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- standby.exp 22 Jun 2006 16:23:32 -0000 1.2
+++ standby.exp 3 Jul 2006 11:50:49 -0000 1.3
@@ -56,7 +56,7 @@
<action_set>
<rsc_op id="26" operation="stop"
operation_key="IPaddr_192_168_1_102_stop_0" on_node="sapcl02"
on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181">
<primitive id="IPaddr_192_168_1_102"
long-id="app02:IPaddr_192_168_1_102" class="ocf" provider="heartbeat"
type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="192.168.1.102"
CRM_meta_timeout="300000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="300000"/>
</rsc_op>
</action_set>
<inputs>
@@ -98,7 +98,7 @@
<action_set>
<rsc_op id="29" operation="stop" operation_key="LVM_12_stop_0"
on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181">
<primitive id="LVM_12" long-id="app02:LVM_12" class="ocf"
provider="heartbeat" type="LVM"/>
- <attributes crm_feature_set="1.0.6" volgrpname="data02vg"
CRM_meta_timeout="300000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="300000"/>
</rsc_op>
</action_set>
<inputs>
@@ -140,7 +140,7 @@
<action_set>
<rsc_op id="32" operation="stop" operation_key="Filesystem_13_stop_0"
on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181">
<primitive id="Filesystem_13" long-id="app02:Filesystem_13"
class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes crm_feature_set="1.0.6" directory="/data/d2"
fstype="ext3" device="/dev/data02vg/v0" CRM_meta_timeout="300000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="300000"/>
</rsc_op>
</action_set>
<inputs>
@@ -235,7 +235,7 @@
<action_set>
<rsc_op id="39" operation="stop"
operation_key="IPaddr_192_168_1_104_stop_0" on_node="sapcl03"
on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750">
<primitive id="IPaddr_192_168_1_104"
long-id="oracle:IPaddr_192_168_1_104" class="ocf" provider="heartbeat"
type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" ip="192.168.1.104"
CRM_meta_timeout="300000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="300000"/>
</rsc_op>
</action_set>
<inputs>
@@ -277,7 +277,7 @@
<action_set>
<rsc_op id="42" operation="stop" operation_key="LVM_22_stop_0"
on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750">
<primitive id="LVM_22" long-id="oracle:LVM_22" class="ocf"
provider="heartbeat" type="LVM"/>
- <attributes crm_feature_set="1.0.6" volgrpname="data03vg"
CRM_meta_timeout="300000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="300000"/>
</rsc_op>
</action_set>
<inputs>
@@ -319,7 +319,7 @@
<action_set>
<rsc_op id="45" operation="stop" operation_key="Filesystem_23_stop_0"
on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750">
<primitive id="Filesystem_23" long-id="oracle:Filesystem_23"
class="ocf" provider="heartbeat" type="Filesystem"/>
- <attributes crm_feature_set="1.0.6" directory="/data/d3" fstype="xfs"
device="/dev/data03vg/v0" CRM_meta_timeout="300000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="300000"/>
</rsc_op>
</action_set>
<inputs>
@@ -361,7 +361,7 @@
<action_set>
<rsc_op id="48" operation="stop" operation_key="oracle_24_stop_0"
on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750">
<primitive id="oracle_24" long-id="oracle:oracle_24" class="ocf"
provider="heartbeat" type="oracle"/>
- <attributes crm_feature_set="1.0.6" sid="testdb"
CRM_meta_timeout="300000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="300000"/>
</rsc_op>
</action_set>
<inputs>
@@ -403,7 +403,7 @@
<action_set>
<rsc_op id="51" operation="stop" operation_key="oralsnr_25_stop_0"
on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750">
<primitive id="oralsnr_25" long-id="oracle:oralsnr_25" class="ocf"
provider="heartbeat" type="oralsnr"/>
- <attributes crm_feature_set="1.0.6" sid="testdb"
CRM_meta_timeout="300000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="300000"/>
</rsc_op>
</action_set>
<inputs>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/target-1.exp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- target-1.exp 22 Jun 2006 16:23:32 -0000 1.10
+++ target-1.exp 3 Jul 2006 11:50:49 -0000 1.11
@@ -57,7 +57,7 @@
<action_set>
<rsc_op id="28" operation="stop" operation_key="rsc_c001n08_stop_0"
on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<primitive id="rsc_c001n08" long-id="rsc_c001n08" class="ocf"
provider="heartbeat" type="IPaddr"/>
- <attributes crm_feature_set="1.0.6" target_role="Stopped"
ip="127.0.0.11" CRM_meta_timeout="180000"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</rsc_op>
</action_set>
<inputs/>
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 32, Issue 1
*******************************************
