From 57a55480853072c5b9c84129c8a708a50ebc3ed8 Mon Sep 17 00:00:00 2001
From: Jan Pokorný <jpokorny@redhat.com>
Date: Fri, 8 Nov 2013 15:58:15 +0100
Subject: cman: new "config" super-node (cluster.conf, libccsconfdb)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
---
 cluster-cman.py | 62 +++++++++++++++++++++++++++++++++++----------------------
 lib_cman.py     | 21 +++++++++++++++++++
 2 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/cluster-cman.py b/cluster-cman.py
index 8ae0513..9580350 100755
--- a/cluster-cman.py
+++ b/cluster-cman.py
@@ -134,6 +134,8 @@ graph = lambda\
                     )
                     ,CmanCmanTool('node_b-cman_tool'
                     )
+                    ,CmanFenceTool('node_b-fence_tool'
+                    )
                     ,CmanModclusterd('node_b-modclusterd'
                     )
                     ,CmanModcluster('node_b-modcluster'
@@ -170,9 +172,6 @@ graph = lambda\
                     ,Library('node_b-service_cman'
                     ,label='service_\ncman.lcrso'
                     )
-                    ,Library('node_b-libccsconfdb'
-                    ,label='libccsconfdb'
-                    )
                     ,CmanFenced('node_b-fenced'
                     )
                     ,CmanRGManager('node_b-rgmanager'
@@ -208,18 +207,6 @@ graph = lambda\
                     ('node_b-rgmanager'
                     ,'node_b-cman_client'
                     )
-                    ,Consume\
-                    ('node_b-fenced'
-                    ,'node_b-libccsconfdb'
-                    )
-                    ,Consume\
-                    ('node_b-rgmanager'
-                    ,'node_b-libccsconfdb'
-                    )
-                    ,Consume\
-                    ('node_b-qdiskd'
-                    ,'node_b-libccsconfdb'
-                    )
                     ,Produce\
                     ('node_b-service_cman'
                     ,'node_b-cman_client'
@@ -230,6 +217,25 @@ graph = lambda\
                     ,'node_b-rgmanager.sk'
                     )]
                 )
+                ,SubgraphStandard('cluster.node_b-config'
+                #
+                # node b - config
+                #
+                ,label='config'
+                ,_nodes=\
+                    [Artefact('node_b-cluster.conf'
+                    ,label='/etc/cluster/\ncluster.conf'
+                    )
+                    ,Library('node_b-libccsconfdb'
+                    ,label='libccsconfdb'
+                    )]
+                ,_edges=\
+                    [Consume\
+                    ('node_b-libccsconfdb'
+                    ,'node_b-cluster.conf'
+                    ,label='version?'
+                    )]
+                )
                 ,SubgraphStandard('cluster.node_b-fence-agents'
                 #
                 # node b - fence agents
@@ -324,10 +330,7 @@ graph = lambda\
                     )]
                 )]
             ,_nodes=\
-                [Artefact('node_b-cluster.conf'
-                ,label='/etc/cluster/\ncluster.conf'
-                )
-                ,RhelSnmpd('node_b-snmpd'
+                [RhelSnmpd('node_b-snmpd'
                 )
                 ,RhelCimserver('node_b-cimserver'
                 )
@@ -335,17 +338,28 @@ graph = lambda\
                 )]
             ,_edges=\
                 [Consume\
-                ('node_b-modcluster'
-                ,'node_b-cluster.conf'
-                ,label='version?'
+                ('node_b-rgmanager'
+                ,'node_b-libccsconfdb'
                 )
                 ,Consume\
-                ('node_b-modclusterd'
+                ('node_b-qdiskd'
+                ,'node_b-libccsconfdb'
+                )
+                ,Consume\
+                ('node_b-fenced'
+                ,'node_b-libccsconfdb'
+                )
+                ,Consume\
+                ('node_b-fence_tool'
+                ,'node_b-libccsconfdb'
+                )
+                ,Consume\
+                ('node_b-modcluster'
                 ,'node_b-cluster.conf'
                 ,label='version?'
                 )
                 ,Consume\
-                ('node_b-libccsconfdb'
+                ('node_b-modclusterd'
                 ,'node_b-cluster.conf'
                 ,label='version?'
                 )
diff --git a/lib_cman.py b/lib_cman.py
index eb91c17..382cfcd 100644
--- a/lib_cman.py
+++ b/lib_cman.py
@@ -131,6 +131,27 @@ class CmanCmanTool(Executable):
     )
 
 
+class CmanFenceTool(Executable):
+    defaults = dict((
+        LABEL('fence_tool'),
+    ))
+    summary = \
+    "fence_tool is a utility for the fenced daemon"
+    repo = dict(
+        git='git://git.fedorahosted.org/git/cluster.git',
+        web='https://git.fedorahosted.org/cgit/cluster.git',
+        ml='https://lists.fedorahosted.org/mailman/listinfo/cluster-commits',
+    )
+    man = [
+        'fence_tool(8)',
+    ]
+    ids = dict(
+        srpm='cluster',
+        rpm='cman',
+        rhbz='cluster',
+    )
+
+
 class CmanRicci(Daemon):
     defaults = dict((
         LABEL('ricci'),
-- 
cgit