Update pacemaker to e9a8f0d048c1bbc86a4bb1ee81417da3afe6673e

e9a8f0d048c1bbc86a4bb1ee81417da3afe6673e Merge pull request #69 from gildub/ipv6/resource_ipaddr2
1950b26946d12cb224bb82a39c9c77db0ea9feb7 Merge pull request #68 from gildub/ip6tables
01c6000db5040055372021ad5a3231840ccb8bba The colons in IPv6 addresses causing title issues
04fd6c145f719ec42e8660e476a03f97376164c2 Added FW rules for IPv6

Change-Id: I8e008b55fd3386882a4f767eef325aae352526c9

Puppetfile

@@ -187,7 +187,7 @@ mod 'openstacklib',
   :git => 'https://github.com/openstack/puppet-openstacklib.git'
 
 mod 'pacemaker',
-  :commit => 'e23cbb084bf48c414c189f45a3761c57ba8375d1',
+  :commit => 'e9a8f0d048c1bbc86a4bb1ee81417da3afe6673e',
   :git => 'https://github.com/redhat-openstack/puppet-pacemaker.git'
 
 mod 'puppet',

pacemaker/manifests/corosync.pp

@@ -47,6 +47,12 @@
       dport  => ['5404', '5405'],
       action => 'accept',
     }
+    firewall { '001 corosync mcast ipv6':
+      proto    => 'udp',
+      dport    => ['5404', '5405'],
+      action   => 'accept',
+      provider => 'ip6tables',
+    }
   }
 
   if $pcsd_mode {
@@ -56,6 +62,12 @@
         dport  => ['2224'],
         action => 'accept',
       }
+      firewall { '001 pcsd ipv6':
+        proto    => 'tcp',
+        dport    => ['2224'],
+        action   => 'accept',
+        provider => 'ip6tables',
+      }
     }
     Service['pcsd'] ->
     # we have more fragile when-to-start pacemaker conditions with pcsd

pacemaker/manifests/resource/ip.pp

@@ -44,7 +44,10 @@
       default => " nic=${nic}"
   }
 
-  pcmk_resource { "ip-${ip_address}":
+  # pcs dislikes colons from IPv6 addresses. Replacing them with dots.
+  $resource_name = regsubst($ip_address, '(:)', '.', 'G')
+
+  pcmk_resource { "ip-${resource_name}":
     ensure             => $ensure,
     resource_type      => 'IPaddr2',
     resource_params    => "ip=${ip_address}${cidr_option}${nic_option}",

pacemaker/manifests/stonith/fence_xvm.pp

@@ -103,15 +103,32 @@
         proto    => 'igmp',
         action   => 'accept',
       }
+      firewall { "003 fence_xvm ipv6":
+        proto    => 'igmp',
+        action   => 'accept',
+        provider => 'ip6tables',
+      }
       firewall { "004 fence_xvm":
         proto    => 'udp',
-        dport     => '1229',
+        dport    => '1229',
         action   => 'accept',
       }
+      firewall { "004 fence_xvm ipv6":
+        proto    => 'udp',
+        dport    => '1229',
+        action   => 'accept',
+        provider => 'ip6tables',
+      }
       firewall { "005 fence_xvm":
         proto    => 'tcp',
-        dport     => '1229',
+        dport    => '1229',
+        action   => 'accept',
+      }
+      firewall { "005 fence_xvm ipv6":
+        proto    => 'tcp',
+        dport    => '1229',
         action   => 'accept',
+        provider => 'ip6tables',
       }
     }
 

pacemaker/manifests/stonith/xvm.pp

@@ -36,15 +36,32 @@
         proto    => 'igmp',
         action   => 'accept',
       }
+      firewall { "003 fence_xvm ipv6":
+        proto    => 'igmp',
+        action   => 'accept',
+        provider => 'ip6tables',
+      }
       firewall { "004 fence_xvm":
         proto    => 'udp',
-        dport     => '1229',
+        dport    => '1229',
+        action   => 'accept',
+      }
+      firewall { "004 fence_xvm ipv6":
+        proto    => 'udp',
+        dport    => '1229',
         action   => 'accept',
+        provider => 'ip6tables',
       }
       firewall { "005 fence_xvm":
+        proto    => 'tcp',
+        dport    => '1229',
+        action   => 'accept',
+      }
+      firewall { "005 fence_xvm ipv6":
         proto    => 'tcp',
         dport     => '1229',
         action   => 'accept',
+        provider => 'ip6tables',
       }
     }