From f694f21eed10fa1f7be1e1d623c509f222e1104e Mon Sep 17 00:00:00 2001
From: Jan Pokorný <jpokorny@redhat.com>
Date: Wed, 6 Nov 2013 23:53:40 +0100
Subject: cluster-cman: finally start getting to the core with corosync
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 | 44 ++++++++++++++++++++++++++++++++++++++++++--
 lib_cman.py     |  6 +++---
 lib_shared.py   | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 78 insertions(+), 5 deletions(-)

diff --git a/cluster-cman.py b/cluster-cman.py
index bb44738..1c03e5a 100755
--- a/cluster-cman.py
+++ b/cluster-cman.py
@@ -165,7 +165,12 @@ graph = lambda\
                 #
                 ,label='core'
                 ,_nodes=\
-                    [Library('node_b-libccsconfdb'
+                    [SharedCorosync('node_b-corosync'
+                    )
+                    ,Library('node_b-service_cman'
+                    ,label='service_\ncman.lcrso'
+                    )
+                    ,Library('node_b-libccsconfdb'
                     ,label='libccsconfdb'
                     )
                     ,CmanFenced('node_b-fenced'
@@ -174,19 +179,43 @@ graph = lambda\
                     )
                     ,CmanClustat('node_b-clustat'
                     )
+                    ,UnixSocket('node_b-cman_client'
+                    ,label='/var/run/\ncman_client'
+                    )
                     ,UnixSocket('node_b-rgmanager.sk'
                     ,label='/var/run/\ncluster/\nrgmanager.sk'
                     )]
                 ,_edges=\
-                    [Consume\
+                    [Delegate\
+                    ('node_b-corosync'
+                    ,'node_b-service_cman'
+                    )
+                    ,Consume\
+                    ('node_b-clustat'
+                    ,'node_b-cman_client'
+                    )
+                    ,Consume\
                     ('node_b-clustat'
                     ,'node_b-rgmanager.sk'
                     )
                     ,Consume\
+                    ('node_b-fenced'
+                    ,'node_b-cman_client'
+                    )
+                    ,Consume\
+                    ('node_b-rgmanager'
+                    ,'node_b-cman_client'
+                    )
+                    ,Consume\
                     ('node_b-rgmanager'
                     ,'node_b-libccsconfdb'
                     )
                     ,Produce\
+                    ('node_b-service_cman'
+                    ,'node_b-cman_client'
+                    ,constraint=False
+                    )
+                    ,Produce\
                     ('node_b-rgmanager'
                     ,'node_b-rgmanager.sk'
                     )]
@@ -311,6 +340,17 @@ graph = lambda\
                 ,label='version?'
                 )
                 ,Consume\
+                ('node_b-modclusterd'
+                ,'node_b-cman_client'
+                ,constraint=False
+                #,label='version?'
+                )
+                ,Consume\
+                ('node_b-modcluster'
+                ,'node_b-cman_client'
+                ,constraint=False
+                )
+                ,Consume\
                 ('node_b-ricci'
                 ,'node_b-cluster.conf'
                 ,label='clustername\nclusteralias'
diff --git a/lib_cman.py b/lib_cman.py
index b0815f4..bc1eecd 100644
--- a/lib_cman.py
+++ b/lib_cman.py
@@ -75,9 +75,9 @@ class CmanRGManager(Daemon):
         'rgmanager(8)',
     ]
     ids = dict(
-        srpm = 'rgmanager'
-        rpm = 'rgmanager'
-        rhbz = 'rgmanager'
+        srpm = 'rgmanager',
+        rpm = 'rgmanager',
+        rhbz = 'rgmanager',
     )
 
 
diff --git a/lib_shared.py b/lib_shared.py
index 5324a05..9ec4fbe 100644
--- a/lib_shared.py
+++ b/lib_shared.py
@@ -53,3 +53,36 @@ class SharedFenceVirt(Executable):
         rpm='fence-virt',
         rhbz='fence-virt',
     )
+
+
+class SharedCorosync(Daemon):
+    defaults = dict((
+        LABEL('corosync'),
+    ))
+    summary = \
+    "Corosync is a Group Communication System with additional features" \
+    + " for implementing high availability within applications"
+    web = 'http://corosync.github.io/corosync/'
+    repo = dict(
+        git='git://github.com/corosync/corosync.git',
+        web='https://github.com/corosync/corosync',
+        ml='http://lists.corosync.org/mailman/listinfo/discuss',
+    )
+    man = [
+        'corosync(8)',
+    ]
+    ids = dict(
+        srpm = 'corosync',
+        rpm = 'corosync',
+        rhbz = 'corosync',
+    )
+    secprops = dict(
+        euser='root',
+        egroup='root',
+        label='unconfined_u:system_r:cluster_t:s0',
+    )
+    miscprops = dict(
+        common_thread_cnt=8,  # ?
+        ppid=1,
+        sched_class='RR',
+    )
-- 
cgit