Fix comparison to control_virtual_ip

When managing the vip's, we were incorrectly comparing the vip to
$control_virtual_interface instead of $controller_virtual_ip when
determining if we needed to actually create the vip or not.

This caused the vips for internal api, storage, and storage mgmt to
always be created even if they were the same as the control vip. Afaict,
this didn't actually cause any problems, other than having extra vip's
created when they weren't needed. Still, this corrects the code to do
what it was intended to do.

Change-Id: I29aee95afcba25008b8b7bee37ba636eb2595cca

diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp
index 8ee4445..d5267bd 100644 (file)
--- a/manifests/loadbalancer.pp
+++ b/manifests/loadbalancer.pp
@@ -523,7 +523,7 @@ class tripleo::loadbalancer (
     }
 
 
-    if $internal_api_virtual_ip and $internal_api_virtual_ip != $control_virtual_interface {
+    if $internal_api_virtual_ip and $internal_api_virtual_ip != $controller_virtual_ip {
       $internal_api_virtual_interface = interface_for_ip($internal_api_virtual_ip)
       # KEEPALIVE INTERNAL API NETWORK
       keepalived::instance { '53':
@@ -535,7 +535,7 @@ class tripleo::loadbalancer (
       }
     }
 
-    if $storage_virtual_ip and $storage_virtual_ip != $control_virtual_interface {
+    if $storage_virtual_ip and $storage_virtual_ip != $controller_virtual_ip {
       $storage_virtual_interface = interface_for_ip($storage_virtual_ip)
       # KEEPALIVE STORAGE NETWORK
       keepalived::instance { '54':
@@ -547,7 +547,7 @@ class tripleo::loadbalancer (
       }
     }
 
-    if $storage_mgmt_virtual_ip and $storage_mgmt_virtual_ip != $control_virtual_interface {
+    if $storage_mgmt_virtual_ip and $storage_mgmt_virtual_ip != $controller_virtual_ip {
       $storage_mgmt_virtual_interface = interface_for_ip($storage_mgmt_virtual_ip)
       # KEEPALIVE STORAGE MANAGEMENT NETWORK
       keepalived::instance { '55':