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: lib by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 3 Apr 2006 04:41:28 -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/pengine/testcases
Modified Files:
764.dot 764.exp
Added Files:
target-0.dot target-0.exp target-0.xml target-1.dot
target-1.exp target-1.xml
Log Message:
Updates
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/764.exp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- 764.exp 8 Mar 2006 15:51:35 -0000 1.13
+++ 764.exp 3 Apr 2006 10:41:27 -0000 1.14
@@ -1,7 +1,7 @@
<transition_graph global_timeout="3m" transition_id="0">
<synapse id="0">
<action_set>
- <rsc_op id="8" rsc_id="DcIPaddr" operation="stop"
operation_key="DcIPaddr_stop_0" on_node="posic043"
on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596">
+ <rsc_op id="6" rsc_id="DcIPaddr" operation="stop"
operation_key="DcIPaddr_stop_0" on_node="posic043"
on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596">
<primitive id="DcIPaddr" class="ocf" type="IPaddr"
provider="heartbeat" is_managed="1"/>
<attributes crm_feature_set="1.0.4" is_managed="1" ip="127.0.0.10"/>
</rsc_op>
@@ -10,7 +10,7 @@
</synapse>
<synapse id="1">
<action_set>
- <rsc_op id="10" rsc_id="rsc_posic041" operation="stop"
operation_key="rsc_posic041_stop_0" on_node="posic041"
on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad">
+ <rsc_op id="8" rsc_id="rsc_posic041" operation="stop"
operation_key="rsc_posic041_stop_0" on_node="posic041"
on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad">
<primitive id="rsc_posic041" class="ocf" type="IPaddr"
provider="heartbeat" is_managed="1"/>
<attributes crm_feature_set="1.0.4" is_managed="1" ip="127.0.0.11"/>
</rsc_op>
@@ -19,7 +19,7 @@
</synapse>
<synapse id="2">
<action_set>
- <rsc_op id="12" rsc_id="rsc_posic042" operation="stop"
operation_key="rsc_posic042_stop_0" on_node="posic041"
on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad">
+ <rsc_op id="10" rsc_id="rsc_posic042" operation="stop"
operation_key="rsc_posic042_stop_0" on_node="posic041"
on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad">
<primitive id="rsc_posic042" class="ocf" type="IPaddr"
provider="heartbeat" is_managed="1"/>
<attributes crm_feature_set="1.0.4" is_managed="1" ip="127.0.0.12"/>
</rsc_op>
@@ -28,7 +28,7 @@
</synapse>
<synapse id="3">
<action_set>
- <rsc_op id="14" rsc_id="rsc_posic043" operation="stop"
operation_key="rsc_posic043_stop_0" on_node="posic043"
on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596">
+ <rsc_op id="12" rsc_id="rsc_posic043" operation="stop"
operation_key="rsc_posic043_stop_0" on_node="posic043"
on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596">
<primitive id="rsc_posic043" class="ocf" type="IPaddr"
provider="heartbeat" is_managed="1"/>
<attributes crm_feature_set="1.0.4" is_managed="1" ip="127.0.0.13"/>
</rsc_op>
@@ -37,7 +37,7 @@
</synapse>
<synapse id="4">
<action_set>
- <rsc_op id="17" rsc_id="rsc_posic044" operation="stop"
operation_key="rsc_posic044_stop_0" on_node="posic041"
on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad">
+ <rsc_op id="15" rsc_id="rsc_posic044" operation="stop"
operation_key="rsc_posic044_stop_0" on_node="posic041"
on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad">
<primitive id="rsc_posic044" class="ocf" type="IPaddr"
provider="heartbeat" is_managed="1"/>
<attributes crm_feature_set="1.0.4" is_managed="1" ip="127.0.0.14"/>
</rsc_op>
@@ -46,12 +46,21 @@
</synapse>
<synapse id="5">
<action_set>
- <rsc_op id="20" rsc_id="DoFencing:child_DoFencing:0"
operation="monitor" operation_key="DoFencing:child_DoFencing:0_monitor_5000"
on_node="posic043" on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596">
+ <rsc_op id="18" rsc_id="DoFencing:child_DoFencing:0"
operation="monitor" operation_key="DoFencing:child_DoFencing:0_monitor_5000"
on_node="posic043" on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596">
<primitive id="DoFencing:child_DoFencing:0" class="stonith"
type="ssh"/>
<attributes timeout="20000" crm_feature_set="1.0.4" interval="5000"
clone="0" clone_max="4" hostlist="posic041 posic042 posic043 posic044 "
clone_node_max="1"/>
</rsc_op>
</action_set>
<inputs/>
</synapse>
+ <synapse id="6">
+ <action_set>
+ <rsc_op id="21" rsc_id="DoFencing:child_DoFencing:1"
operation="monitor" operation_key="DoFencing:child_DoFencing:1_monitor_5000"
on_node="posic041" on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad">
+ <primitive id="DoFencing:child_DoFencing:1" class="stonith"
type="ssh"/>
+ <attributes timeout="20000" crm_feature_set="1.0.4" interval="5000"
clone="1" clone_max="4" hostlist="posic041 posic042 posic043 posic044 "
clone_node_max="1"/>
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
</transition_graph>
------------------------------
Message: 2
Date: Mon, 3 Apr 2006 04:42:06 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/transition
Modified Files:
utils.c
Log Message:
Logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/transition/utils.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- utils.c 18 Mar 2006 17:23:49 -0000 1.6
+++ utils.c 3 Apr 2006 10:42:05 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.6 2006/03/18 17:23:49 andrew Exp $ */
+/* $Id: utils.c,v 1.7 2006/04/03 10:42:05 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -136,7 +136,7 @@
case action_type_pseudo:
crm_log_maybe(log_level, "%s\tPseudo Op: %s", prefix,
crm_element_value(
- action->xml, XML_LRM_ATTR_TASK));
+ action->xml,
XML_LRM_ATTR_TASK_KEY));
break;
case action_type_rsc:
crm_log_maybe(log_level, "%s\tResource Op: %s/%s on %s",
------------------------------
Message: 3
Date: Mon, 3 Apr 2006 04:42: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:
Makefile.am
Log Message:
Cleanup
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- Makefile.am 17 Dec 2005 06:04:59 -0000 1.11
+++ Makefile.am 3 Apr 2006 10:42:46 -0000 1.12
@@ -21,16 +21,23 @@
SUBDIRS = cib crmd pengine tengine admin test
DIST_SUBDIRS = cib crmd pengine tengine admin test
-crmdir = $(HA_VARLIBDIR)/$(HB_PKG)/crm
-crm_sock_dir = $(HA_VARRUNDIR)/$(HB_PKG)/crm
-noinst_HEADERS = dmalloc_wrapper.h
+crm_libdir = $(libdir)/$(HB_PKG)/crm
+crm_varlibdir = $(HA_VARLIBDIR)/$(HB_PKG)/crm
+crm_varrundir = $(HA_VARRUNDIR)/$(HB_PKG)/crm
+noinst_HEADERS = dmalloc_wrapper.h
+
+crm_lib_SCRIPTS = crm-1.0.dtd
install-exec-local:
- $(mkinstalldirs) $(DESTDIR)/$(crmdir)
- -chown $(HA_CCMUSER) $(DESTDIR)/$(crmdir)
- -chgrp $(HA_APIGROUP) $(DESTDIR)/$(crmdir)
- -chmod 750 $(DESTDIR)/$(crmdir)
- -mkdir $(DESTDIR)/$(crm_sock_dir)
- -chown $(HA_CCMUSER) $(DESTDIR)/$(crm_sock_dir)
- -chgrp $(HA_APIGROUP) $(DESTDIR)/$(crm_sock_dir)
- -chmod 750 $(DESTDIR)/$(crm_sock_dir)
+ $(mkinstalldirs) $(DESTDIR)/$(crm_varlibdir)
+ -chown $(HA_CCMUSER) $(DESTDIR)/$(crm_varlibdir)
+ -chgrp $(HA_APIGROUP) $(DESTDIR)/$(crm_varlibdir)
+ -chmod 750 $(DESTDIR)/$(crm_varlibdir)
+ $(mkinstalldirs) $(DESTDIR)/$(crm_varrundir)
+ -chown $(HA_CCMUSER) $(DESTDIR)/$(crm_varrundir)
+ -chgrp $(HA_APIGROUP) $(DESTDIR)/$(crm_varrundir)
+ -chmod 750 $(DESTDIR)/$(crm_varrundir)
+ $(mkinstalldirs) $(DESTDIR)/$(crm_libdir)
+ -chown $(HA_CCMUSER) $(DESTDIR)/$(crm_libdir)
+ -chgrp $(HA_APIGROUP) $(DESTDIR)/$(crm_libdir)
+ -chmod 750 $(DESTDIR)/$(crm_libdir)
------------------------------
_______________________________________________
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 8
*******************************************
