diff --git a/cts/CIB.py.in b/cts/CIB.py.in
index d425c5da0e..462c40db8e 100644
--- a/cts/CIB.py.in
+++ b/cts/CIB.py.in
@@ -1,249 +1,276 @@
 #!@PYTHON@
 
 '''CTS: Cluster Testing System: CIB generator
 '''
 __copyright__='''
 Author: Jia Ming Pan <jmltc@cn.ibm.com>
 Copyright (C) 2006 International Business Machines
 '''
 
 from UserDict import UserDict
 import sys, time, types, syslog, os, struct, string, signal, traceback
 
 from CTS  import ClusterManager
 from CM_hb import HeartbeatCM
 
 class CIB:
     cib_option_template = '''
     <cluster_property_set id="cib-bootstrap-options">
        <attributes>
         <nvpair id="cib-bootstrap-1" name="start-failure-is-fatal" value="false"/>
         <nvpair id="cib-bootstrap-2" name="stonith-enabled"      value="%d"/>
         <nvpair id="cib-bootstrap-3" name="pe-input-series-max"  value="30000"/>
         <nvpair id="cib-bootstrap-4" name="shutdown-escalation"  value="5min"/>
         <nvpair id="cib-bootstrap-5" name="startup-fencing"      value="false"/>
         <nvpair id="cib-bootstrap-6" name="batch-limit"          value="10"/>
         <nvpair id="cib-bootstrap-7" name="no-quorum-policy"     value="%s"/>
        </attributes>
     </cluster_property_set>'''
 
     ipaddr_template = ''' 
         <primitive id="%s" class="ocf" type="IPaddr" provider="heartbeat">
           <operations>
             <op id="%s-mon" name="monitor" interval="5s"/>
           </operations>
           <instance_attributes id="%s">
             <attributes>
               <nvpair id="%s-netmask" name="cidr_netmask" value="32"/>
               <nvpair id="%s-ip" name="ip" value="%s"/>
             </attributes>
           </instance_attributes>
         </primitive> '''
 
     hb_ipaddr_template = ''' 
         <primitive id="%s" class="heartbeat" type="IPaddr">
           <operations>
             <op id="%s-mon" name="monitor" interval="5s"/>
           </operations>
           <instance_attributes id="%s">
             <attributes>
               <nvpair id="%s-ip" name="1" value="%s/32"/>
             </attributes>
           </instance_attributes>
         </primitive> '''
 
     lsb_resource = ''' 
         <primitive id="lsb_dummy" class="lsb" type="@datadir@/@PKG_NAME@/cts/LSBDummy" provider="heartbeat">
           <operations>
             <op id="ocf_lsb_monitor" name="monitor" interval="5s"/>
           </operations>
         </primitive> '''
 
     dummy_resource_template = ''' 
         <primitive id="%s" class="ocf" type="Dummy" provider="heartbeat">
           <operations>
              <op id="%s-mon" name="monitor" interval="P10S"/>
           </operations>
           <instance_attributes id="%s">
              <attributes>
                <nvpair id="%s-migrate" name="allow_migrate" value="1"/>
              </attributes>
           </instance_attributes>
         </primitive> '''
     
     clustermon_resource_template = ''' 
         <primitive id="cluster_mon" class="ocf" type="ClusterMon" provider="heartbeat">
           <operations>
             <op id="cluster_mon-1" name="monitor" interval="5s" prereq="nothing"/>
             <op id="cluster_mon-2" name="start" prereq="nothing"/>
           </operations>
           <instance_attributes id="ClusterMon">
             <attributes>
                <nvpair id="cluster_mon-1" name="htmlfile" value="/suse/abeekhof/Export/cluster.html"/>
                <nvpair id="cluster_mon-2" name="update" value="10"/>
                <nvpair id="cluster_mon-3" name="extra_options" value="-n -r"/>
                <nvpair id="cluster_mon-4" name="user" value="abeekhof"/>
            </attributes>
           </instance_attributes>
         </primitive> ''' 
 
     clustermon_location_constraint = ''' 
         <rsc_location id="run_cluster_mon" rsc="cluster_mon">
           <rule id="cant_run_cluster_mon" score="-INFINITY" boolean_op="and">
              <expression id="mon_expr" attribute="#is_dc" operation="eq" value="false"/>
           </rule>
         </rsc_location> '''
 
     master_slave_resource = ''' 
         <master_slave id="master-1">
           <instance_attributes id="master_rsc">
             <attributes>
               <nvpair id="clone_max_1" name="clone_max" value="%d"/>
               <nvpair id="clone_node_max_2" name="clone_node_max" value="%d"/>
               <nvpair id="master_max_3" name="master_max" value="%d"/>
               <nvpair id="master_node_max_4" name="master_node_max" value="%d"/>
             </attributes>
           </instance_attributes>
           <primitive id="ocf_msdummy" class="ocf" type="Stateful" provider="heartbeat">
             <operations>
               <op id="ocf_msdummy_monitor" name="monitor" interval="15s"/>
               <op id="ocf_msdummy_monitor_master" name="monitor" interval="16s" role="Master"/>
             </operations>
           </primitive>
         </master_slave>'''
 
     resource_group_template = '''<group id="group-1">%s %s %s</group>'''
 
     per_node_constraint_template = ''' 
-        <rsc_location id="run_%s" rsc="%s">
-          <rule id="pref_run_%s" score="100" boolean_op="and">
-            <expression id="%s_loc_expr" attribute="#uname" operation="eq" value="%s"/>
+        <rsc_location id="preferred-%s" rsc="%s" node="%s" score="100"/>''' 
+
+    pingd_resource_template = """ 
+        <clone id="Connectivity">
+          <meta_attributes id="pingd-opts">
+            <attributes>
+              <nvpair id="pingd-opt-1" name="globally_unique" value="false"/>
+            </attributes>
+          </meta_attributes>
+          <primitive id="pingd" class="ocf" provider="pacemaker" type="pingd">
+            <operations>
+              <op id="pingd-op-1" name="monitor" interval="120s"/>
+            </operations>
+            <instance_attributes id="pingd-attrs">
+              <attributes>
+                <nvpair id="pingd-attr-1" name="host_list" value="%s"/>
+                <nvpair id="pingd-attr-2" name="name" value="connected"/>
+              </attributes>
+            </instance_attributes>
+          </primitive>
+        </clone>"""
+
+    pingd_constraint_template = '''<rsc_location id="%s-is-connected" rsc="%s">
+          <rule id="%s-connected-rule" role="%s" score="-INFINITY">
+            <expression id="%s-connected-expr" attribute="connected" operation="lt" value="%d"/>
           </rule>
-        </rsc_location> ''' 
+        </rsc_location>''' 
 
     stonith_resource_template = """ 
-        <clone id="DoFencing" globally_unique="false">
+        <clone id="DoFencing">
           <meta_attributes id="fencing">
             <attributes>
               <nvpair id="DoFencing-1" name="resource_failure_stickiness" value="-1"/>
+              <nvpair id="DoFencing-2" name="globally_unique" value="false"/>
             </attributes>
           </meta_attributes>
           <primitive id="child_DoFencing" class="stonith" type="%s">
             <operations>
               <op id="DoFencing-1" name="monitor" interval="120s" prereq="nothing" timeout="300s"/>
               <op id="DoFencing-2" name="start" prereq="nothing"  timeout="180s"/>
               <op id="DoFencing-3" name="stop" timeout="180s"/>
             </operations>
             <instance_attributes id="fencing-child">
               <attributes>
                 <nvpair id="child_DoFencing-1" name="%s" value="%s"/>
                 <nvpair id="child_DoFencing-2" name="livedangerously" value="yes"/>
               </attributes>
             </instance_attributes>
           </primitive>
         </clone>"""
 
     cib_template ='''
 <cib cib_feature_revision="1" have_quorum="false" ignore_dtd="false" validate-with="transitional-0.6" remote_access_port="9898">
   <configuration>
      <crm_config>  %s 
      </crm_config>
      <nodes/>
      <resources> %s 
      </resources>
      <constraints> %s 
      </constraints>
     </configuration>
     <status/>
 </cib> '''
 
     def NextIP(self):
         fields = string.split(self.CM.Env["IPBase"], '.')
         fields[3] = str(int(fields[3])+1)
         ip = string.join(fields, '.')
         self.CM.Env["IPBase"]=ip
         return ip
 
     def __init__(self, CM):
         self.CM = CM
 
         # fencing resource
         nodelist = ""
         num_nodes = 0
         for node in self.CM.Env["nodes"]:
             nodelist += node + " "
             num_nodes = num_nodes + 1
 
         no_quorum = "stop"
         if num_nodes < 3:
             no_quorum = "ignore"
             self.CM.debug("Cluster only has %d nodes, ignoring quorum" % num_nodes) 
 
         #make up crm config
         cib_options = self.cib_option_template % (CM.Env["DoFencing"], no_quorum)
 
         #create resources and their constraints
         resources = ""
         constraints = ""
 
         if self.CM.Env["DoBSC"] == 1:
             cib_options = cib_options + '''
      <cluster_property_set id="bsc-options">
        <attributes>
          <nvpair id="bsc-options-ident-string" name="ident-string" value="Linux-HA TEST configuration file - REMOVEME!!"/>
        </attributes>
     </cluster_property_set>'''
 
         if self.CM.Env["CIBResource"] != 1:
             # generate cib
             self.cts_cib = self.cib_template %  (cib_options, resources, constraints)
             return
 
         if self.CM.cluster_monitor == 1:
             resources += self.clustermon_resource_template
             constraints += self.clustermon_location_constraint
             
         ip1=self.NextIP()
         ip2=self.NextIP()
         ip3=self.NextIP()
         ip1_rsc = self.ipaddr_template % ("r"+ip1, ip1, ip1, ip1, ip1, ip1)
         ip2_rsc = self.hb_ipaddr_template % ("r"+ip2, ip2, ip2, ip2, ip2)
         ip3_rsc = self.ipaddr_template % ("r"+ip3, ip3, ip3, ip3, ip3, ip3)
         resources += self.resource_group_template % (ip1_rsc, ip2_rsc, ip3_rsc)
 
         # lsb resource
         resources += self.lsb_resource
 
         # Mirgator
-        resources += self.dummy_resource_template % \
-            ("migrator", "migrator", "migrator", "migrator")
+        resources += self.dummy_resource_template % ("migrator", "migrator", "migrator", "migrator")
 
         constraints += """<rsc_colocation id="group-with-master" from="group-1" to="master-1" to_role="Master" score="INFINITY"/>"""
         constraints += """<rsc_colocation id="lsb-with-group" from="lsb_dummy" to="group-1" score="INFINITY"/>"""
 
         # per node resource
         fields = string.split(self.CM.Env["IPBase"], '.')
         for node in self.CM.Env["nodes"]:
             ip = self.NextIP()
             per_node_resources = self.ipaddr_template % \
                 ("rsc_"+node, "rsc_"+node, "rsc_"+node, "rsc_"+node, "rsc_"+node, ip)    
             
-            per_node_constraint = self.per_node_constraint_template % \
-                ("rsc_"+node, "rsc_"+node, "rsc_"+node, "rsc_"+node, node)
+            per_node_constraint = self.per_node_constraint_template % (node, "rsc_"+node, node)
                 
             resources += per_node_resources
             constraints += per_node_constraint    
 
+        # Ping the test master
+        resources += self.pingd_resource_template % os.uname()[1]
+
+        # Require conectivity to run
+        constraints += self.pingd_constraint_template % ("master-1", "master-1", "m", "Started", "m", 1)
+
         if CM.Env["DoFencing"]:
             stonith_resource = self.stonith_resource_template % \
                 (self.CM.Env["reset"].stonithtype, self.CM.Env["reset"].configName, self.CM.Env["reset"].configValue)
             resources += stonith_resource
         
         #master slave resource
         resources += self.master_slave_resource % (num_nodes, 1, 1, 1)
 
         # generate cib
         self.cts_cib = self.cib_template %  (cib_options, resources, constraints)
 
     def cib(self):
         return self.cts_cib