stackforge/puppet-openstack-cloud
Code Issues Proposed changes

loadbalancer: fix vip

Browse Source 
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2014-01-07 10:32:42 +01:00
parent aff84c487c
commit d083bf0359
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
manifests/loadbalancer.pp
View File

@ -36,7 +36,7 @@ class privatecloud::loadbalancer(
$haproxy_auth = $os_params::haproxy_auth, $haproxy_auth = $os_params::haproxy_auth,
$keepalived_email = $os_params::keepalived_email, $keepalived_email = $os_params::keepalived_email,
$keepalived_interface = $os_params::keepalived_interface, $keepalived_interface = $os_params::keepalived_interface,
$keepalived_ipvs = [], $keepalived_ipvs = [ $os_params::openstack_vip, $os_params::mysql_vip ],
$keepalived_localhost_ip = $os_params::keepalived_localhost_ip, $keepalived_localhost_ip = $os_params::keepalived_localhost_ip,
$keepalived_smtp = $os_params::keepalived_smtp, $keepalived_smtp = $os_params::keepalived_smtp,
$ks_cinder_ceilometer_port = $os_params::ks_ceilometer_public_port, $ks_cinder_ceilometer_port = $os_params::ks_ceilometer_public_port,
@ -55,6 +55,8 @@ class privatecloud::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,
$mysql_vip = $os_params::mysql_vip
){ ){
class { 'haproxy': } class { 'haproxy': }
@ -156,7 +158,7 @@ monitor fail if horizon_dead
} }
haproxy::listen { 'monitor': haproxy::listen { 'monitor':
ipaddress => $keepalived_localhost_ip, ipaddress => $openstack_vip,
ports => '9300', ports => '9300',
options => { options => {
'mode' => 'http', 'mode' => 'http',
@ -173,7 +175,7 @@ monitor fail if horizon_dead
listen_ip => $keepalived_localhost_ip; listen_ip => $keepalived_localhost_ip;
'keystone_api_admin_cluster': 'keystone_api_admin_cluster':
ports => $ks_keystone_admin_port, ports => $ks_keystone_admin_port,
listen_ip => $keepalived_localhost_ip; listen_ip => $openstack_vip;
} }
} }
if $swift_api { if $swift_api {
@ -181,35 +183,35 @@ monitor fail if horizon_dead
'swift_api_cluster': 'swift_api_cluster':
ports => $ks_swift_public_port, ports => $ks_swift_public_port,
httpchk => 'httpchk /healthcheck', httpchk => 'httpchk /healthcheck',
listen_ip => $keepalived_localhost_ip; listen_ip => $openstack_vip;
} }
} }
if $nova_api { if $nova_api {
privatecloud::loadbalancer::listen_http{ privatecloud::loadbalancer::listen_http{
'nova_api_cluster': 'nova_api_cluster':
ports => $ks_nova_public_port, ports => $ks_nova_public_port,
listen_ip => $keepalived_localhost_ip; listen_ip => $openstack_vip;
} }
} }
if $ec2_api { if $ec2_api {
privatecloud::loadbalancer::listen_http{ privatecloud::loadbalancer::listen_http{
'ec2_api_cluster': 'ec2_api_cluster':
ports => $ks_ec2_public_port, ports => $ks_ec2_public_port,
listen_ip => $keepalived_localhost_ip; listen_ip => $openstack_vip;
} }
} }
if $metadata_api { if $metadata_api {
privatecloud::loadbalancer::listen_http{ privatecloud::loadbalancer::listen_http{
'metadata_api_cluster': 'metadata_api_cluster':
ports => $ks_metadata_public_port, ports => $ks_metadata_public_port,
listen_ip => $keepalived_localhost_ip; listen_ip => $openstack_vip;
} }
} }
if $spice { if $spice {
privatecloud::loadbalancer::listen_http{ privatecloud::loadbalancer::listen_http{
'spice_cluster': 'spice_cluster':
ports => $spice_port, ports => $spice_port,
listen_ip => $keepalived_localhost_ip, listen_ip => $openstack_vip,
httpchk => 'httpchk GET /'; httpchk => 'httpchk GET /';
} }
} }
@ -217,61 +219,61 @@ monitor fail if horizon_dead
privatecloud::loadbalancer::listen_http{ privatecloud::loadbalancer::listen_http{
'glance_api_cluster': 'glance_api_cluster':
ports => $ks_glance_public_port, ports => $ks_glance_public_port,
listen_ip => $keepalived_localhost_ip; listen_ip => $openstack_vip;
} }
} }
if $neutron_api { if $neutron_api {
privatecloud::loadbalancer::listen_http{ privatecloud::loadbalancer::listen_http{
'neutron_api_cluster': 'neutron_api_cluster':
ports => $ks_neutron_public_port, ports => $ks_neutron_public_port,
listen_ip => $keepalived_localhost_ip; listen_ip => $openstack_vip;
} }
} }
if $cinder_api { if $cinder_api {
privatecloud::loadbalancer::listen_http{ privatecloud::loadbalancer::listen_http{
'cinder_api_cluster': 'cinder_api_cluster':
ports => $ks_cinder_public_port, ports => $ks_cinder_public_port,
listen_ip => $keepalived_localhost_ip; listen_ip => $openstack_vip;
} }
} }
if $ceilometer_api { if $ceilometer_api {
privatecloud::loadbalancer::listen_http{ privatecloud::loadbalancer::listen_http{
'ceilometer_api_cluster': 'ceilometer_api_cluster':
ports => $ks_ceilometer_public_port, ports => $ks_ceilometer_public_port,
listen_ip => $keepalived_localhost_ip; listen_ip => $openstack_vip;
} }
} }
if $heat_api { if $heat_api {
privatecloud::loadbalancer::listen_http{ privatecloud::loadbalancer::listen_http{
'heat_api_cluster': 'heat_api_cluster':
ports => $ks_heat_public_port, ports => $ks_heat_public_port,
listen_ip => $keepalived_localhost_ip; listen_ip => $openstack_vip;
} }
} }
if $heat_cfn_api { if $heat_cfn_api {
privatecloud::loadbalancer::listen_http{ privatecloud::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 => $keepalived_localhost_ip; listen_ip => $openstack_vip;
} }
} }
if $heat_cloudwatch_api { if $heat_cloudwatch_api {
privatecloud::loadbalancer::listen_http{ privatecloud::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 => $keepalived_localhost_ip; listen_ip => $openstack_vip;
} }
} }
if $horizon { if $horizon {
privatecloud::loadbalancer::listen_http{ privatecloud::loadbalancer::listen_http{
'horizon_cluster': 'horizon_cluster':
ports => $horizon_port, ports => $horizon_port,
listen_ip => $keepalived_localhost_ip; listen_ip => $openstack_vip;
} }
} }
haproxy::listen { 'galera_cluster': haproxy::listen { 'galera_cluster':
ipaddress => $keepalived_localhost_ip, ipaddress => $mysql_vip,
ports => 3306, ports => 3306,
options => { options => {
'mode' => 'tcp', 'mode' => 'tcp',