From dea55aba7fa0474d18cc22209631a053dc272526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= Date: Mon, 27 Jan 2014 17:55:03 +0100 Subject: [PATCH] replace the undef mysql_vip by galera_ip closes #66 --- manifests/loadbalancer.pp | 4 ++-- spec/classes/cloud_loadbalancer_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp index 500ff4b0..428e5ca1 100644 --- a/manifests/loadbalancer.pp +++ b/manifests/loadbalancer.pp @@ -53,7 +53,7 @@ class cloud::loadbalancer( $horizon_port = $os_params::horizon_port, $spice_port = $os_params::spice_port, $openstack_vip = $os_params::openstack_vip, - $mysql_vip = $os_params::mysql_vip + $galera_ip = $os_params::galera_ip ){ class { 'haproxy': @@ -200,7 +200,7 @@ class cloud::loadbalancer( } haproxy::listen { 'galera_cluster': - ipaddress => $mysql_vip, + ipaddress => $galera_ip, ports => 3306, options => { 'mode' => 'tcp', diff --git a/spec/classes/cloud_loadbalancer_spec.rb b/spec/classes/cloud_loadbalancer_spec.rb index f4c65752..175ed0a8 100644 --- a/spec/classes/cloud_loadbalancer_spec.rb +++ b/spec/classes/cloud_loadbalancer_spec.rb @@ -47,7 +47,7 @@ describe 'cloud::loadbalancer' do :horizon_port => '80', :spice_port => '6082', :openstack_vip => '10.0.0.3', - :mysql_vip => '10.0.0.4', + :galera_ip => '10.0.0.4', :ks_ceilometer_public_port => '8777', :ks_nova_public_port => '8774', :ks_ec2_public_port => '8773', @@ -120,7 +120,7 @@ describe 'cloud::loadbalancer' do context 'configure monitor haproxy listen' do it { should contain_haproxy__listen('galera_cluster').with( - :ipaddress => params[:mysql_vip], + :ipaddress => params[:galera_ip], :ports => '3306', :options => { 'mode' => 'tcp',