stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Change haproxy monitor port

Browse Source 
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
This commit is contained in:
Yanis Guenane 2015-02-09 05:48:58 -05:00
parent 37ea263506
commit 7aab373728
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/loadbalancer.pp
View File

@ -579,7 +579,7 @@ class cloud::loadbalancer(
haproxy::listen { 'monitor': haproxy::listen { 'monitor':
ipaddress => $vip_monitor_ip_real, ipaddress => $vip_monitor_ip_real,
ports => '9300', ports => '10300',
options => { options => {
'mode' => 'http', 'mode' => 'http',
'monitor-uri' => '/status', 'monitor-uri' => '/status',
@ -836,7 +836,7 @@ class cloud::loadbalancer(
extras => $firewall_settings, extras => $firewall_settings,
} }
cloud::firewall::rule{ '100 allow haproxy monitor access': cloud::firewall::rule{ '100 allow haproxy monitor access':
port => '9300', port => '10300',
extras => $firewall_settings, extras => $firewall_settings,
} }
cloud::firewall::rule{ '100 allow keepalived access': cloud::firewall::rule{ '100 allow keepalived access':

8
spec/classes/cloud_loadbalancer_spec.rb
View File

@ -208,7 +208,7 @@ describe 'cloud::loadbalancer' do
context 'configure monitor haproxy listen' do context 'configure monitor haproxy listen' do
it { is_expected.to contain_haproxy__listen('monitor').with( it { is_expected.to contain_haproxy__listen('monitor').with(
:ipaddress => params[:vip_public_ip], :ipaddress => params[:vip_public_ip],
:ports => '9300' :ports => '10300'
)} )}
end # configure monitor haproxy listen end # configure monitor haproxy listen
@ -218,7 +218,7 @@ describe 'cloud::loadbalancer' do
end end
it { is_expected.to contain_haproxy__listen('monitor').with( it { is_expected.to contain_haproxy__listen('monitor').with(
:ipaddress => ['192.168.0.1'], :ipaddress => ['192.168.0.1'],
:ports => '9300' :ports => '10300'
)} )}
end # configure monitor haproxy listen end # configure monitor haproxy listen
@ -539,7 +539,7 @@ describe 'cloud::loadbalancer' do
:action => 'accept', :action => 'accept',
) )
is_expected.to contain_firewall('100 allow haproxy monitor access').with( is_expected.to contain_firewall('100 allow haproxy monitor access').with(
:port => '9300', :port => '10300',
:proto => 'tcp', :proto => 'tcp',
:action => 'accept', :action => 'accept',
) )
@ -574,7 +574,7 @@ describe 'cloud::loadbalancer' do
:limit => '50/sec', :limit => '50/sec',
) )
is_expected.to contain_firewall('100 allow haproxy monitor access').with( is_expected.to contain_firewall('100 allow haproxy monitor access').with(
:port => '9300', :port => '10300',
:proto => 'tcp', :proto => 'tcp',
:action => 'accept', :action => 'accept',
:limit => '50/sec', :limit => '50/sec',