From b96089d214b7b3c6985eaf1bc51da47d8baadd6f Mon Sep 17 00:00:00 2001
From: Crag Wolfe <cwolfe@redhat.com>
Date: Wed, 30 Apr 2014 22:44:07 -0400
Subject: [PATCH] ha controller: add fence_ipmilan_host_to_address param to
 commmon

This is a list of pairs that determines what address to use
when creating a stonith ipmilan device in pacemaker.

E.g., given a fence_ipmilan_host_to_address that looks like:
["192.168.200.10:10.10.10.10", "192.168.200.20:10.10.10.20",
"192.168.200.30:10.10.10.30"],

the cluster node 192.168.200.10 should use 10.10.10.10 as its ipmilan
fence address.

Note that the "address" param must be blank when providing the
"fence_ipmilan_host_to_address" param.
---
 .../quickstack/manifests/pacemaker/common.pp  | 14 +++++----
 .../manifests/pacemaker/stonith/ipmilan.pp    | 30 ++++++++++++++-----
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/puppet/modules/quickstack/manifests/pacemaker/common.pp b/puppet/modules/quickstack/manifests/pacemaker/common.pp
index 71badaba..8984806b 100644
--- a/puppet/modules/quickstack/manifests/pacemaker/common.pp
+++ b/puppet/modules/quickstack/manifests/pacemaker/common.pp
@@ -38,6 +38,7 @@
   $fence_ipmilan_password         = "",
   $fence_ipmilan_interval         = "60s",
   $fence_ipmilan_hostlist         = "",
+  $fence_ipmilan_host_to_address  = [],
   $fence_xvm_clu_iface            = "eth2",
   $fence_xvm_clu_network          = "",
   $fence_xvm_manage_key_file      = "false",
@@ -68,12 +69,13 @@
       disable => false,
     }
     class {'quickstack::pacemaker::stonith::ipmilan':
-      address        => $fence_ipmilan_address,
-      username       => $fence_ipmilan_username,
-      password       => $fence_ipmilan_password,
-      interval       => $fence_ipmilan_interval,
-      pcmk_host_list => $fence_ipmilan_hostlist,
-      lanplus        => true,
+      address         => $fence_ipmilan_address,
+      username        => $fence_ipmilan_username,
+      password        => $fence_ipmilan_password,
+      interval        => $fence_ipmilan_interval,
+      pcmk_host_list  => $fence_ipmilan_hostlist,
+      host_to_address => $fence_ipmilan_host_to_address,
+      lanplus         => true,
     }
   }
   elsif $fencing_type =~ /(?i-mx:^fence_xvm$)/ {
diff --git a/puppet/modules/quickstack/manifests/pacemaker/stonith/ipmilan.pp b/puppet/modules/quickstack/manifests/pacemaker/stonith/ipmilan.pp
index a69d0dc6..ef78b501 100644
--- a/puppet/modules/quickstack/manifests/pacemaker/stonith/ipmilan.pp
+++ b/puppet/modules/quickstack/manifests/pacemaker/stonith/ipmilan.pp
@@ -6,13 +6,29 @@
   $ensure          = "present",
   $lanplus         = false,
   $lanplus_options = '',
-  $pcmk_host_list ="",
+  $pcmk_host_list  = "",
+  $host_to_address = [],
   ) {
 
+  # a string that looks like "cluster_ip1,address1,cluster_ip1,adress2,...,"
+  # with any errant single quotes, double quotes, or white space removed
+  # and ":" replaced with ","
+  $host_to_address_string = inline_template('<%= @host_to_address.map {
+    |x| x.gsub(/\s+/, "").gsub("\'", "").gsub("\"", "").gsub(":",",")}.join(",") +"," %>')
+
+  # this nastiness exist because this puppet manifest doesn't know
+  # during compilation what its cluster IP is, and therefore wouldn't
+  # know which address to pick out of $host_to_address.  so we defer
+  # it to bash.
+  $real_address = $address ? {
+      ''      => "$(/bin/echo $host_to_address_string | /usr/bin/perl -p -e \"s/.*$(/usr/sbin/crm_node -n),(.*?),.*/\\\$1/\")",
+      default => "${address}",
+  }
+
   if($ensure == absent) {
-    exec { "Removing stonith::ipmilan ${address}":
-      command => "/usr/sbin/pcs stonith delete stonith-ipmilan-${address}",
-      onlyif  => "/usr/sbin/pcs stonith show stonith-ipmilan-${address} > /dev/null 2>&1",
+    exec { "Removing stonith::ipmilan":
+      command => "/usr/sbin/pcs stonith delete stonith-ipmilan-${real_address}",
+      onlyif  => "/usr/sbin/pcs stonith show stonith-ipmilan-${real_address} > /dev/null 2>&1",
       require => Class['pacemaker::corosync'],
     }
   } else {
@@ -37,9 +53,9 @@
     package { "ipmitool":
       ensure => installed,
     } ->
-    exec { "Creating stonith::ipmilan ${address}":
-      command => "/usr/sbin/pcs stonith create stonith-ipmilan-${address} fence_ipmilan ${pcmk_host_list_chunk} ipaddr=${address} ${username_chunk} ${password_chunk} ${lanplus_chunk} op monitor interval=${interval}",
-      unless  => "/usr/sbin/pcs stonith show stonith-ipmilan-${address} > /dev/null 2>&1",
+    exec { "Creating stonith::ipmilan":
+      command => "/usr/sbin/pcs stonith create stonith-ipmilan-${real_address} fence_ipmilan ${pcmk_host_list_chunk} ipaddr=${real_address} ${username_chunk} ${password_chunk} ${lanplus_chunk} op monitor interval=${interval}",
+      unless  => "/usr/sbin/pcs stonith show stonith-ipmilan-${real_address} > /dev/null 2>&1",
       require => Class['pacemaker::corosync'],
     }
   }