stackforge/puppet-openstack-cloud
Code Issues Proposed changes

replace undef $openstack_vip with $vip_public_ip

Browse Source
This commit is contained in:
Gonéri Le Bouder 2014-01-27 18:10:00 +01:00
parent dea55aba7f
commit 8be330079e
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
manifests/loadbalancer.pp
View File

@ -52,7 +52,7 @@ class cloud::loadbalancer(
$ks_swift_public_port = $os_params::ks_swift_public_port, $ks_swift_public_port = $os_params::ks_swift_public_port,
$horizon_port = $os_params::horizon_port, $horizon_port = $os_params::horizon_port,
$spice_port = $os_params::spice_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 $galera_ip = $os_params::galera_ip
){ ){
@ -85,7 +85,7 @@ class cloud::loadbalancer(
} }
haproxy::listen { 'monitor': haproxy::listen { 'monitor':
ipaddress => $openstack_vip, ipaddress => $vip_public_ip,
ports => '9300', ports => '9300',
options => { options => {
'mode' => 'http', 'mode' => 'http',
@ -99,10 +99,10 @@ class cloud::loadbalancer(
cloud::loadbalancer::listen_http { cloud::loadbalancer::listen_http {
'keystone_api_cluster': 'keystone_api_cluster':
ports => $ks_keystone_public_port, ports => $ks_keystone_public_port,
listen_ip => $openstack_vip; listen_ip => $vip_public_ip;
'keystone_api_admin_cluster': 'keystone_api_admin_cluster':
ports => $ks_keystone_admin_port, ports => $ks_keystone_admin_port,
listen_ip => $openstack_vip; listen_ip => $vip_public_ip;
} }
} }
if $swift_api { if $swift_api {
@ -110,35 +110,35 @@ class cloud::loadbalancer(
'swift_api_cluster': 'swift_api_cluster':
ports => $ks_swift_public_port, ports => $ks_swift_public_port,
httpchk => 'httpchk /healthcheck', httpchk => 'httpchk /healthcheck',
listen_ip => $openstack_vip; listen_ip => $vip_public_ip;
} }
} }
if $nova_api { if $nova_api {
cloud::loadbalancer::listen_http{ cloud::loadbalancer::listen_http{
'nova_api_cluster': 'nova_api_cluster':
ports => $ks_nova_public_port, ports => $ks_nova_public_port,
listen_ip => $openstack_vip; listen_ip => $vip_public_ip;
} }
} }
if $ec2_api { if $ec2_api {
cloud::loadbalancer::listen_http{ cloud::loadbalancer::listen_http{
'ec2_api_cluster': 'ec2_api_cluster':
ports => $ks_ec2_public_port, ports => $ks_ec2_public_port,
listen_ip => $openstack_vip; listen_ip => $vip_public_ip;
} }
} }
if $metadata_api { if $metadata_api {
cloud::loadbalancer::listen_http{ cloud::loadbalancer::listen_http{
'metadata_api_cluster': 'metadata_api_cluster':
ports => $ks_metadata_public_port, ports => $ks_metadata_public_port,
listen_ip => $openstack_vip; listen_ip => $vip_public_ip;
} }
} }
if $spice { if $spice {
cloud::loadbalancer::listen_http{ cloud::loadbalancer::listen_http{
'spice_cluster': 'spice_cluster':
ports => $spice_port, ports => $spice_port,
listen_ip => $openstack_vip, listen_ip => $vip_public_ip,
httpchk => 'httpchk GET /'; httpchk => 'httpchk GET /';
} }
} }
@ -146,56 +146,56 @@ class cloud::loadbalancer(
cloud::loadbalancer::listen_http{ cloud::loadbalancer::listen_http{
'glance_api_cluster': 'glance_api_cluster':
ports => $ks_glance_public_port, ports => $ks_glance_public_port,
listen_ip => $openstack_vip; listen_ip => $vip_public_ip;
} }
} }
if $neutron_api { if $neutron_api {
cloud::loadbalancer::listen_http{ cloud::loadbalancer::listen_http{
'neutron_api_cluster': 'neutron_api_cluster':
ports => $ks_neutron_public_port, ports => $ks_neutron_public_port,
listen_ip => $openstack_vip; listen_ip => $vip_public_ip;
} }
} }
if $cinder_api { if $cinder_api {
cloud::loadbalancer::listen_http{ cloud::loadbalancer::listen_http{
'cinder_api_cluster': 'cinder_api_cluster':
ports => $ks_cinder_public_port, ports => $ks_cinder_public_port,
listen_ip => $openstack_vip; listen_ip => $vip_public_ip;
} }
} }
if $ceilometer_api { if $ceilometer_api {
cloud::loadbalancer::listen_http{ cloud::loadbalancer::listen_http{
'ceilometer_api_cluster': 'ceilometer_api_cluster':
ports => $ks_ceilometer_public_port, ports => $ks_ceilometer_public_port,
listen_ip => $openstack_vip; listen_ip => $vip_public_ip;
} }
} }
if $heat_api { if $heat_api {
cloud::loadbalancer::listen_http{ cloud::loadbalancer::listen_http{
'heat_api_cluster': 'heat_api_cluster':
ports => $ks_heat_public_port, ports => $ks_heat_public_port,
listen_ip => $openstack_vip; listen_ip => $vip_public_ip;
} }
} }
if $heat_cfn_api { if $heat_cfn_api {
cloud::loadbalancer::listen_http{ cloud::loadbalancer::listen_http{
'heat_api_cfn_cluster': 'heat_api_cfn_cluster':
ports => $ks_heat_cfn_public_port, ports => $ks_heat_cfn_public_port,
listen_ip => $openstack_vip; listen_ip => $vip_public_ip;
} }
} }
if $heat_cloudwatch_api { if $heat_cloudwatch_api {
cloud::loadbalancer::listen_http{ cloud::loadbalancer::listen_http{
'heat_api_cloudwatch_cluster': 'heat_api_cloudwatch_cluster':
ports => $ks_heat_cloudwatch_public_port, ports => $ks_heat_cloudwatch_public_port,
listen_ip => $openstack_vip; listen_ip => $vip_public_ip;
} }
} }
if $horizon { if $horizon {
cloud::loadbalancer::listen_http{ cloud::loadbalancer::listen_http{
'horizon_cluster': 'horizon_cluster':
ports => $horizon_port, ports => $horizon_port,
listen_ip => $openstack_vip; listen_ip => $vip_public_ip;
} }
} }

4
spec/classes/cloud_loadbalancer_spec.rb
View File

@ -46,7 +46,7 @@ describe 'cloud::loadbalancer' do
:keepalived_localhost_ip => '127.0.0.1', :keepalived_localhost_ip => '127.0.0.1',
:horizon_port => '80', :horizon_port => '80',
:spice_port => '6082', :spice_port => '6082',
:openstack_vip => '10.0.0.3', :vip_public_ip => '10.0.0.3',
:galera_ip => '10.0.0.4', :galera_ip => '10.0.0.4',
:ks_ceilometer_public_port => '8777', :ks_ceilometer_public_port => '8777',
:ks_nova_public_port => '8774', :ks_nova_public_port => '8774',
@ -113,7 +113,7 @@ describe 'cloud::loadbalancer' do
context 'configure monitor haproxy listen' do context 'configure monitor haproxy listen' do
it { should contain_haproxy__listen('monitor').with( it { should contain_haproxy__listen('monitor').with(
:ipaddress => params[:openstack_vip], :ipaddress => params[:vip_public_ip],
:ports => '9300' :ports => '9300'
)} )}
end # configure monitor haproxy listen end # configure monitor haproxy listen