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: cim by panjiam from
([email protected])
2. Linux-HA CVS: include by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: lib by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 4 Apr 2006 20:54:45 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cim by panjiam from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : panjiam
Host :
Project : linux-ha
Module : cim
Dir : linux-ha/cim/mof
Modified Files:
do_register.sh
Log Message:
detect http port and https port for openwbem
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/mof/do_register.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- do_register.sh 15 Nov 2005 06:41:00 -0000 1.2
+++ do_register.sh 5 Apr 2006 02:54:45 -0000 1.3
@@ -9,6 +9,39 @@
#
#---------- openwbem functions ---------------------------------------
+
+openwbem_config=""
+openwbem_http_port=5988
+openwbem_https_port=5989
+openwbem_get_config_pathname()
+{
+ owcimomd=`which owcimomd`
+ prefix=`dirname $owcimomd`
+ prefix=`dirname $prefix`
+ echo config file: "$prefix/etc/openwbem/openwbem.conf"
+ openwbem_config="$prefix/etc/openwbem/openwbem.conf"
+}
+
+openwbem_get_http_port()
+{
+ openwbem_get_config_pathname
+ http_port=`grep -e "http_server.http_port.*=" $openwbem_config | sed -e
's/.*=\W*\(\D*\)/\1/'`
+ if [ "X$http_port" != "X" ]; then
+ openwbem_http_port=$http_port
+ fi
+ echo openwbem_http_port: $openwbem_http_port
+}
+
+openwbem_get_https_port()
+{
+ openwbem_get_config_pathname
+ https_port=`grep -e "http_server.https_port.*=" $openwbem_config | sed
-e 's/.*=\W*\(\D*\)/\1/'`
+ if [ "X$https_port" != "X" ]; then
+ openwbem_https_port=$https_port
+ fi
+ echo openwbem_https_port: $openwbem_https_port
+}
+
openwbem_register ()
{
mof_file=$1
@@ -24,8 +57,9 @@
if test $? != 0; then
echo "owmofc not found, OpenWbem not installed?"
fi
-
- $OWMOFC $mof_file
+
+ openwbem_get_http_port
+ $OWMOFC -u "http://localhost:$openwbem_http_port/root/cimv2"; $mof_file
}
openwbem_unregister ()
@@ -44,7 +78,8 @@
echo "owmofc not found, OpenWbem not installed?"
fi
- $OWMOFC -r $mof_file
+ openwbem_get_http_port
+ $OWMOFC -u "http://localhost:$openwbem_http_port/root/cimv2"; -r
$mof_file
}
#---------- pegasus functions ----------------------------------------
------------------------------
Message: 2
Date: Wed, 5 Apr 2006 01:37:38 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/crm
Modified Files:
msg_xml.h
Log Message:
Fix creation of options in crm_config
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/msg_xml.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- msg_xml.h 4 Apr 2006 13:19:45 -0000 1.50
+++ msg_xml.h 5 Apr 2006 07:37:37 -0000 1.51
@@ -1,4 +1,4 @@
-/* $Id: msg_xml.h,v 1.50 2006/04/04 13:19:45 andrew Exp $ */
+/* $Id: msg_xml.h,v 1.51 2006/04/05 07:37:37 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -117,6 +117,7 @@
#define XML_CIB_TAG_CONSTRAINT "constraint"
#define XML_CIB_TAG_NVPAIR "nvpair"
+#define XML_CIB_TAG_PROPSET "cluster_property_set"
#define XML_TAG_ATTR_SETS "instance_attributes"
#define XML_TAG_ATTRS "attributes"
#define XML_TAG_PARAMS "parameters"
------------------------------
Message: 3
Date: Wed, 5 Apr 2006 01:37:38 -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
Modified Files:
unpack.c
Log Message:
Fix creation of options in crm_config
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/unpack.c,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -3 -r1.180 -r1.181
--- unpack.c 4 Apr 2006 17:25:21 -0000 1.180
+++ unpack.c 5 Apr 2006 07:37:36 -0000 1.181
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.180 2006/04/04 17:25:21 andrew Exp $ */
+/* $Id: unpack.c,v 1.181 2006/04/05 07:37:36 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -90,7 +90,7 @@
data_set->config_hash = config_hash;
unpack_instance_attributes(
- config, "cluster_property_set", NULL, config_hash,
+ config, XML_CIB_TAG_PROPSET, NULL, config_hash,
NULL, 0, data_set);
#if CRM_DEPRECATED_SINCE_2_0_1
------------------------------
Message: 4
Date: Wed, 5 Apr 2006 01:37:38 -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/cib
Modified Files:
cib_attrs.c
Log Message:
Fix creation of options in crm_config
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/cib/cib_attrs.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- cib_attrs.c 4 Apr 2006 13:09:27 -0000 1.15
+++ cib_attrs.c 5 Apr 2006 07:37:37 -0000 1.16
@@ -1,4 +1,4 @@
-/* $Id: cib_attrs.c,v 1.15 2006/04/04 13:09:27 andrew Exp $ */
+/* $Id: cib_attrs.c,v 1.16 2006/04/05 07:37:37 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -46,6 +46,7 @@
const char *attr_id, const char *attr_name, const char *attr_value)
{
const char *tag = NULL;
+ gboolean is_crm_config = FALSE;
enum cib_errors rc = cib_ok;
crm_data_t *xml_top = NULL;
@@ -64,6 +65,7 @@
if(safe_str_eq(section, XML_CIB_TAG_CRMCONFIG)) {
tag = NULL;
+ is_crm_config = TRUE;
} else if(safe_str_eq(section, XML_CIB_TAG_NODES)) {
tag = XML_CIB_TAG_NODE;
@@ -93,7 +95,11 @@
}
if(set_name != NULL) {
- xml_obj = create_xml_node(xml_obj, XML_TAG_ATTR_SETS);
+ if(is_crm_config) {
+ xml_obj = create_xml_node(xml_obj, XML_CIB_TAG_PROPSET);
+ } else {
+ xml_obj = create_xml_node(xml_obj, XML_TAG_ATTR_SETS);
+ }
if(xml_top == NULL) {
xml_top = xml_obj;
}
------------------------------
_______________________________________________
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 23
********************************************
