From 7aab3737281fd6c3cc1dcd82b1726c7b96e45ab0 Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Mon, 9 Feb 2015 05:48:58 -0500 Subject: [PATCH] Change haproxy monitor port Current haproxy monitor listens on port 9300, which conflict with ElsaticSearch (internal communication). Hence the default port is changed from 9300 to 10300. Change-Id: I9d31df3f25845994a965ac1c8677ca87e480b66a --- manifests/loadbalancer.pp | 4 ++-- spec/classes/cloud_loadbalancer_spec.rb | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp index 19a0219c..55baa8c3 100644 --- a/manifests/loadbalancer.pp +++ b/manifests/loadbalancer.pp @@ -579,7 +579,7 @@ class cloud::loadbalancer( haproxy::listen { 'monitor': ipaddress => $vip_monitor_ip_real, - ports => '9300', + ports => '10300', options => { 'mode' => 'http', 'monitor-uri' => '/status', @@ -836,7 +836,7 @@ class cloud::loadbalancer( extras => $firewall_settings, } cloud::firewall::rule{ '100 allow haproxy monitor access': - port => '9300', + port => '10300', extras => $firewall_settings, } cloud::firewall::rule{ '100 allow keepalived access': diff --git a/spec/classes/cloud_loadbalancer_spec.rb b/spec/classes/cloud_loadbalancer_spec.rb index 78b49b64..d77d1375 100644 --- a/spec/classes/cloud_loadbalancer_spec.rb +++ b/spec/classes/cloud_loadbalancer_spec.rb @@ -208,7 +208,7 @@ describe 'cloud::loadbalancer' do context 'configure monitor haproxy listen' do it { is_expected.to contain_haproxy__listen('monitor').with( :ipaddress => params[:vip_public_ip], - :ports => '9300' + :ports => '10300' )} end # configure monitor haproxy listen @@ -218,7 +218,7 @@ describe 'cloud::loadbalancer' do end it { is_expected.to contain_haproxy__listen('monitor').with( :ipaddress => ['192.168.0.1'], - :ports => '9300' + :ports => '10300' )} end # configure monitor haproxy listen @@ -539,7 +539,7 @@ describe 'cloud::loadbalancer' do :action => 'accept', ) is_expected.to contain_firewall('100 allow haproxy monitor access').with( - :port => '9300', + :port => '10300', :proto => 'tcp', :action => 'accept', ) @@ -574,7 +574,7 @@ describe 'cloud::loadbalancer' do :limit => '50/sec', ) is_expected.to contain_firewall('100 allow haproxy monitor access').with( - :port => '9300', + :port => '10300', :proto => 'tcp', :action => 'accept', :limit => '50/sec',