Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2013-10-17 14:01:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "crmsh"
Changes:
--------
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2013-09-27
17:07:40.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2013-10-17
14:01:27.000000000 +0200
@@ -1,0 +2,9 @@
+Wed Oct 16 11:50:58 UTC 2013 - dmuhameda...@suse.com
+
+- doc: explain groups in more detail (bnc#845336)
+- cibconf: fix two fencing top issues (savannah#40173)
+- node: clear state new way since pcmk 1.1.8 (bnc#843699)
+- cibconf: improve message when producing a configuration graph
+- upstream cs: 6ebf75d0560b (1.2.6)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ crmsh.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh/.hg_archival.txt new/crmsh/.hg_archival.txt
--- old/crmsh/.hg_archival.txt 2013-09-25 17:42:12.000000000 +0200
+++ new/crmsh/.hg_archival.txt 2013-10-16 12:48:23.000000000 +0200
@@ -1,5 +1,5 @@
repo: 13c3bd69e935090cd25213c474cafc3f01b5910b
-node: 6c2edea885b534c94b6b606e1c37ab3e62ca7854
+node: 4f66cc1901854a7cb60d483414ce5cf2d749db60
branch: 1.2.6
latesttag: crmsh-1.2.6
-latesttagdistance: 2
+latesttagdistance: 5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh/doc/crm.8.txt new/crmsh/doc/crm.8.txt
--- old/crmsh/doc/crm.8.txt 2013-09-25 17:42:12.000000000 +0200
+++ new/crmsh/doc/crm.8.txt 2013-10-16 12:48:23.000000000 +0200
@@ -1743,7 +1743,20 @@
[[cmdhelp_configure_group,define a group]]
==== `group`
-The `group` command creates a group of resources.
+The `group` command creates a group of resources. This can be useful
+when resources depend on other resources and require that those
+resources start in order on the same node. A commmon use of resource
+groups is to ensure that a server and a virtual IP are located
+together, and that the virtual IP is started before the server.
+
+Grouped resources are started in the order they appear in the group,
+and stopped in the reverse order. If a resource in the group cannot
+run anywhere, resources following it in the group will not start.
+
+`group` can be passed the "container" meta attribute, to indicate that
+it is to be used to group VM resources monitored using Nagios. The
+resource referred to by the container attribute must be of type
+`ocf:heartbeat:Xen`, `oxf:heartbeat:VirtualDomain` or `ocf:heartbeat:lxc`.
Usage:
...............
@@ -1757,6 +1770,8 @@
...............
group internal_www disk0 fs0 internal_ip apache \
meta target_role=stopped
+
+ group vm-and-services vm vm-sshd meta container="vm"
...............
[[cmdhelp_configure_clone,define a clone]]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh/modules/cibconfig.py
new/crmsh/modules/cibconfig.py
--- old/crmsh/modules/cibconfig.py 2013-09-25 17:42:12.000000000 +0200
+++ new/crmsh/modules/cibconfig.py 2013-10-16 12:48:23.000000000 +0200
@@ -1927,7 +1927,8 @@
d[target][c.get("index")] = c.get("devices")
dd = odict()
for target in d.keys():
- dd[target] = [d[target][x] for x in sorted(d[target].keys())]
+ dd[target] = [d[target][str(x)]
+ for x in sorted([int(i) for i in d[target].keys()])]
d2 = {}
for target in dd.keys():
devs_s = ' '.join(dd[target])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh/modules/ui.py new/crmsh/modules/ui.py
--- old/crmsh/modules/ui.py 2013-09-25 17:42:12.000000000 +0200
+++ new/crmsh/modules/ui.py 2013-10-16 12:48:23.000000000 +0200
@@ -1206,6 +1206,7 @@
node_delete = "cibadmin -D -o nodes -X '<node uname=\"%s\"/>'"
node_delete_status = "cibadmin -D -o status -X '<node_state
uname=\"%s\"/>'"
node_clear_state = "cibadmin %s -o status --xml-text '<node_state
id=\"%s\" uname=\"%s\" ha=\"active\" in_ccm=\"false\" crmd=\"offline\"
join=\"member\" expected=\"down\" crm-debug-origin=\"manual_clear\"
shutdown=\"0\"/>'"
+ node_clear_state_118 = "stonith_admin --confirm %s"
hb_delnode = config.DATADIR + "/heartbeat/hb_delnode '%s'"
crm_node = "crm_node"
node_fence = "crm_attribute -t status -U '%s' -n terminate -v true"
@@ -1354,8 +1355,11 @@
if not user_prefs.force and \
not utils.ask("Do you really want to drop state for node %s?"
% node):
return False
- return utils.ext_cmd(self.node_clear_state % ("-M -c", node, node)) ==
0 and \
- utils.ext_cmd(self.node_clear_state % ("-R", node, node)) == 0
+ if utils.is_pcmk_118():
+ return utils.ext_cmd(self.node_clear_state_118 % node) == 0
+ else:
+ return utils.ext_cmd(self.node_clear_state % ("-M -c", node,
node)) == 0 and \
+ utils.ext_cmd(self.node_clear_state % ("-R", node, node)) == 0
def delete(self, cmd, node):
'usage: delete <node>'
@@ -1664,7 +1668,7 @@
self.cmd_table["property"] = (self.conf_property, (1,), 1, 0)
self.cmd_table["rsc_defaults"] = (self.conf_rsc_defaults, (1,), 1, 0)
self.cmd_table["op_defaults"] = (self.conf_op_defaults, (1,), 1, 0)
- self.cmd_table["fencing_topology"] = (self.conf_fencing_order, (2,),
1, 0)
+ self.cmd_table["fencing_topology"] = (self.conf_fencing_order, (1,),
1, 0)
self.cmd_table["xml"] = (self.conf_xml, (1,), 1, 0)
self.cmd_table["monitor"] = (self.conf_monitor, (2, 2), 1, 0)
self.cmd_table["role"] = (self.conf_role, (2,), 2, 0)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
