From 8be330079ef0b62d6b1bda57dd23f9ecec3871d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= <goneri.lebouder@enovance.com>
Date: Mon, 27 Jan 2014 18:10:00 +0100
Subject: [PATCH] replace undef $openstack_vip with $vip_public_ip

---
 manifests/loadbalancer.pp               | 34 ++++++++++++-------------
 spec/classes/cloud_loadbalancer_spec.rb |  4 +--
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp
index 428e5ca1..40464efb 100644
--- a/manifests/loadbalancer.pp
+++ b/manifests/loadbalancer.pp
@@ -52,7 +52,7 @@ class cloud::loadbalancer(
   $ks_swift_public_port           = $os_params::ks_swift_public_port,
   $horizon_port                   = $os_params::horizon_port,
   $spice_port                     = $os_params::spice_port,
-  $openstack_vip                  = $os_params::openstack_vip,
+  $vip_public_ip                  = $os_params::vip_public_ip,
   $galera_ip                      = $os_params::galera_ip
 ){
 
@@ -85,7 +85,7 @@ class cloud::loadbalancer(
   }
 
   haproxy::listen { 'monitor':
-    ipaddress => $openstack_vip,
+    ipaddress => $vip_public_ip,
     ports     => '9300',
     options   => {
       'mode'        => 'http',
@@ -99,10 +99,10 @@ class cloud::loadbalancer(
     cloud::loadbalancer::listen_http {
       'keystone_api_cluster':
         ports     => $ks_keystone_public_port,
-        listen_ip => $openstack_vip;
+        listen_ip => $vip_public_ip;
       'keystone_api_admin_cluster':
         ports     => $ks_keystone_admin_port,
-        listen_ip => $openstack_vip;
+        listen_ip => $vip_public_ip;
     }
   }
   if $swift_api {
@@ -110,35 +110,35 @@ class cloud::loadbalancer(
       'swift_api_cluster':
         ports     => $ks_swift_public_port,
         httpchk   => 'httpchk /healthcheck',
-        listen_ip => $openstack_vip;
+        listen_ip => $vip_public_ip;
     }
   }
   if $nova_api {
     cloud::loadbalancer::listen_http{
       'nova_api_cluster':
         ports     => $ks_nova_public_port,
-        listen_ip => $openstack_vip;
+        listen_ip => $vip_public_ip;
     }
   }
   if $ec2_api {
     cloud::loadbalancer::listen_http{
       'ec2_api_cluster':
         ports     => $ks_ec2_public_port,
-        listen_ip => $openstack_vip;
+        listen_ip => $vip_public_ip;
     }
   }
   if $metadata_api {
     cloud::loadbalancer::listen_http{
       'metadata_api_cluster':
         ports     => $ks_metadata_public_port,
-        listen_ip => $openstack_vip;
+        listen_ip => $vip_public_ip;
     }
   }
   if $spice {
     cloud::loadbalancer::listen_http{
       'spice_cluster':
         ports     => $spice_port,
-        listen_ip => $openstack_vip,
+        listen_ip => $vip_public_ip,
         httpchk   => 'httpchk GET /';
     }
   }
@@ -146,56 +146,56 @@ class cloud::loadbalancer(
     cloud::loadbalancer::listen_http{
       'glance_api_cluster':
         ports     => $ks_glance_public_port,
-        listen_ip => $openstack_vip;
+        listen_ip => $vip_public_ip;
     }
   }
   if $neutron_api {
     cloud::loadbalancer::listen_http{
       'neutron_api_cluster':
         ports     => $ks_neutron_public_port,
-        listen_ip => $openstack_vip;
+        listen_ip => $vip_public_ip;
     }
   }
   if $cinder_api {
     cloud::loadbalancer::listen_http{
       'cinder_api_cluster':
         ports     => $ks_cinder_public_port,
-        listen_ip => $openstack_vip;
+        listen_ip => $vip_public_ip;
     }
   }
   if $ceilometer_api {
     cloud::loadbalancer::listen_http{
       'ceilometer_api_cluster':
         ports     => $ks_ceilometer_public_port,
-        listen_ip => $openstack_vip;
+        listen_ip => $vip_public_ip;
     }
   }
   if $heat_api {
     cloud::loadbalancer::listen_http{
       'heat_api_cluster':
         ports     => $ks_heat_public_port,
-        listen_ip => $openstack_vip;
+        listen_ip => $vip_public_ip;
     }
   }
   if $heat_cfn_api {
     cloud::loadbalancer::listen_http{
       'heat_api_cfn_cluster':
         ports     => $ks_heat_cfn_public_port,
-        listen_ip => $openstack_vip;
+        listen_ip => $vip_public_ip;
     }
   }
   if $heat_cloudwatch_api {
     cloud::loadbalancer::listen_http{
       'heat_api_cloudwatch_cluster':
         ports     => $ks_heat_cloudwatch_public_port,
-        listen_ip => $openstack_vip;
+        listen_ip => $vip_public_ip;
     }
   }
   if $horizon {
     cloud::loadbalancer::listen_http{
       'horizon_cluster':
         ports     => $horizon_port,
-        listen_ip => $openstack_vip;
+        listen_ip => $vip_public_ip;
     }
   }
 
diff --git a/spec/classes/cloud_loadbalancer_spec.rb b/spec/classes/cloud_loadbalancer_spec.rb
index 175ed0a8..3fb171f6 100644
--- a/spec/classes/cloud_loadbalancer_spec.rb
+++ b/spec/classes/cloud_loadbalancer_spec.rb
@@ -46,7 +46,7 @@ describe 'cloud::loadbalancer' do
         :keepalived_localhost_ip        => '127.0.0.1',
         :horizon_port                   => '80',
         :spice_port                     => '6082',
-        :openstack_vip                  => '10.0.0.3',
+        :vip_public_ip                  => '10.0.0.3',
         :galera_ip                      => '10.0.0.4',
         :ks_ceilometer_public_port      => '8777',
         :ks_nova_public_port            => '8774',
@@ -113,7 +113,7 @@ describe 'cloud::loadbalancer' do
 
     context 'configure monitor haproxy listen' do
       it { should contain_haproxy__listen('monitor').with(
-        :ipaddress => params[:openstack_vip],
+        :ipaddress => params[:vip_public_ip],
         :ports     => '9300'
       )}
     end # configure monitor haproxy listen