From: Lukas Bezdicka <lbezdick@redhat.com>
Date: Tue, 10 Jan 2017 21:27:10 +0000 (+0100)
Subject: [keepalived] fix netmask for vip
X-Git-Tag: opnfv-6.0.0~380^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=51ed5351f7e729ffab69f8543b9bbe4e8e4d5d9e;p=apex-puppet-tripleo.git

[keepalived] fix netmask for vip

For pacemaker we ensure netmask of virtual IP to 64bit for IPv6 and
32bit for IPv4. We should have feature parity in keepalived setup.[1]
The issue is that puppet picks first IP orf ifconfig output as and
interface IP. In case of IPv6 keepalived would add new IP to
interface with netmask 128 causing interface_for_ip to fail on
second puppet run.

[1] - https://github.com/openstack/puppet-tripleo/blob/master/manifests/pacemaker/haproxy_with_vip.pp

Closes-Bug: #1659309

Change-Id: Icb0c9a8d51a9bfcdc4b2caef9e52fdeb6f634cba
---

diff --git a/manifests/keepalived.pp b/manifests/keepalived.pp
index 0e9262d..a6d5832 100644
--- a/manifests/keepalived.pp
+++ b/manifests/keepalived.pp
@@ -113,10 +113,15 @@ class tripleo::keepalived (
 
   if $internal_api_virtual_ip and $internal_api_virtual_ip != $controller_virtual_ip {
     $internal_api_virtual_interface = interface_for_ip($internal_api_virtual_ip)
+    if is_ipv6_address($internal_api_virtual_ip) {
+      $internal_api_virtual_netmask = '64'
+    } else {
+      $internal_api_virtual_netmask = '32'
+    }
     # KEEPALIVE INTERNAL API NETWORK
     keepalived::instance { '53':
       interface    => $internal_api_virtual_interface,
-      virtual_ips  => [join([$internal_api_virtual_ip, ' dev ', $internal_api_virtual_interface])],
+      virtual_ips  => [join(["${internal_api_virtual_ip}/${internal_api_virtual_netmask}", ' dev ', $internal_api_virtual_interface])],
       state        => 'MASTER',
       track_script => ['haproxy'],
       priority     => 101,
@@ -125,10 +130,15 @@ class tripleo::keepalived (
 
   if $storage_virtual_ip and $storage_virtual_ip != $controller_virtual_ip {
     $storage_virtual_interface = interface_for_ip($storage_virtual_ip)
+    if is_ipv6_address($storage_virtual_ip) {
+      $storage_virtual_netmask = '64'
+    } else {
+      $storage_virtual_netmask = '32'
+    }
     # KEEPALIVE STORAGE NETWORK
     keepalived::instance { '54':
       interface    => $storage_virtual_interface,
-      virtual_ips  => [join([$storage_virtual_ip, ' dev ', $storage_virtual_interface])],
+      virtual_ips  => [join(["${storage_virtual_ip}/${storage_virtual_netmask}", ' dev ', $storage_virtual_interface])],
       state        => 'MASTER',
       track_script => ['haproxy'],
       priority     => 101,
@@ -137,10 +147,15 @@ class tripleo::keepalived (
 
   if $storage_mgmt_virtual_ip and $storage_mgmt_virtual_ip != $controller_virtual_ip {
     $storage_mgmt_virtual_interface = interface_for_ip($storage_mgmt_virtual_ip)
+    if is_ipv6_address($storage_mgmt_virtual_ip) {
+      $storage_mgmt_virtual_netmask = '64'
+    } else {
+      $storage_mgmt_virtual_netmask = '32'
+    }
     # KEEPALIVE STORAGE MANAGEMENT NETWORK
     keepalived::instance { '55':
       interface    => $storage_mgmt_virtual_interface,
-      virtual_ips  => [join([$storage_mgmt_virtual_ip, ' dev ', $storage_mgmt_virtual_interface])],
+      virtual_ips  => [join(["${storage_mgmt_virtual_ip}/${storage_mgmt_virtual_netmask}", ' dev ', $storage_mgmt_virtual_interface])],
       state        => 'MASTER',
       track_script => ['haproxy'],
       priority     => 101,
@@ -149,10 +164,15 @@ class tripleo::keepalived (
 
   if $redis_virtual_ip and $redis_virtual_ip != $controller_virtual_ip {
     $redis_virtual_interface = interface_for_ip($redis_virtual_ip)
+    if is_ipv6_address($redis_virtual_ip) {
+      $redis_virtual_netmask = '64'
+    } else {
+      $redis_virtual_netmask = '32'
+    }
     # KEEPALIVE STORAGE MANAGEMENT NETWORK
     keepalived::instance { '56':
       interface    => $redis_virtual_interface,
-      virtual_ips  => [join([$redis_virtual_ip, ' dev ', $redis_virtual_interface])],
+      virtual_ips  => [join(["${redis_virtual_ip}/${redis_virtual_netmask}", ' dev ', $redis_virtual_interface])],
       state        => 'MASTER',
       track_script => ['haproxy'],
       priority     => 101,