Merge lp:~openstack-charmers/charms/precise/hacluster/add-pingd-support into lp:charms/hacluster

[Marco Ceppi]

[Marco Ceppi (marcoceppi)]

Deferring to openstack-charmers

review: Abstain

[James Page (james-page)]

monitor_interval config is never actually retrieved:

    if monitor_host:
        cmd = 'crm -F configure primitive Ping' \
              ' ocf:pacemaker:ping params host_list="%s"' \
              ' multiplier="100" op monitor interval="%s"' %\
                                            (monitor_host,
                                             monitor_interval)

review: Needs Fixing

=== modified file 'config.yaml'
--- config.yaml	2013-04-30 09:37:52 +0000
+++ config.yaml	2014-02-19 12:31:39 +0000
@@ -41,3 +41,16 @@
     type: int
     default: 2
     description: Number of peer units required to bootstrap cluster services.
+  monitor_host:
+    type: string
+    description: |
+     One or more IPs, separated by space, that will be used as a saftey check
+     for avoiding split brain situations. Nodes in the cluster will ping these
+     IPs periodicaly. Node that can not ping monitor_host will not run shared
+     resources (VIP, shared disk...).
+  monitor_interval:
+    type: string
+    default: 5s
+    description: |
+     Time period between checks of resource health. It consists of a number
+     and a time factor, e.g. 5s = 5 seconds. 2m = 2 minutes.

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2013-03-24 13:33:02 +0000
+++ hooks/hooks.py	2014-02-19 12:31:39 +0000
@@ -226,6 +226,19 @@
           ' resource-stickiness="100"'
     pcmk.commit(cmd)
 
+    # Configure Ping service
+    monitor_host = utils.config_get('monitor_host')
+    if monitor_host:
+        cmd = 'crm -F configure primitive Ping' \
+              ' ocf:pacemaker:ping params host_list="%s"' \
+              ' multiplier="100" op monitor interval="%s"' %\
+                                            (monitor_host,
+                                             monitor_interval)
+        cmd2 = 'crm -F configure clone PingClone Ping' \
+               ' meta interleave="true"'
+        pcmk.commit(cmd)
+        pcmk.commit(cmd2)
+
     # Only configure the cluster resources
     # from the oldest peer unit.
     if cluster.oldest_peer(cluster.peer_units()):
@@ -256,6 +269,10 @@
                                  resource_params[res_name])
                 pcmk.commit(cmd)
                 utils.juju_log('INFO', '%s' % cmd)
+                if monitor_host:
+                    cmd = 'crm -F configure location Ping-%s %s rule' \
+                          ' -inf: pingd lte 0' % (res_name, res_name)
+                    pcmk.commit(cmd)
 
         utils.juju_log('INFO', 'Configuring Groups')
         utils.juju_log('INFO', str(groups))

=== modified file 'revision'
--- revision	2013-04-30 19:48:37 +0000
+++ revision	2014-02-19 12:31:39 +0000
@@ -1,1 +1,1 @@
-67
+68