stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge "Change haproxy monitor port"

Browse Source
This commit is contained in:
Jenkins 2015-02-09 14:56:51 +00:00 committed by Gerrit Code Review
commit 61ebbfa956
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

@ -617,7 +617,7 @@ class cloud::loadbalancer(
haproxy::listen { 'monitor':
ipaddress => $vip_monitor_ip_real,
ports => '9300',
ports => '10300',
options => {
'mode' => 'http',
'monitor-uri' => '/status',
@ -887,7 +887,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':

8
spec/classes/cloud_loadbalancer_spec.rb
View File

@ -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',