Better keepalived priorities
This commit is contained in:
parent
c20a48cfc8
commit
cc84dc7063
@ -521,7 +521,10 @@ class compact_controller (
|
||||
cinder_rate_limits => $cinder_rate_limits,
|
||||
horizon_use_ssl => $horizon_use_ssl,
|
||||
use_unicast_corosync => $use_unicast_corosync,
|
||||
ha_provider => $ha_provider
|
||||
ha_provider => $ha_provider,
|
||||
internal_virtual_ip_mask => '24',
|
||||
public_virtual_ip_mask => '24',
|
||||
keepalived_vrrp_script => "killall -0 haproxy"
|
||||
}
|
||||
class { 'swift::keystone::auth':
|
||||
password => $swift_user_password,
|
||||
|
@ -524,7 +524,10 @@ class compact_controller (
|
||||
cinder_rate_limits => $cinder_rate_limits,
|
||||
horizon_use_ssl => $horizon_use_ssl,
|
||||
use_unicast_corosync => $use_unicast_corosync,
|
||||
ha_provider => $ha_provider
|
||||
ha_provider => $ha_provider,
|
||||
internal_virtual_ip_mask => '24',
|
||||
public_virtual_ip_mask => '24',
|
||||
keepalived_vrrp_script => "killall -0 haproxy"
|
||||
}
|
||||
class { 'swift::keystone::auth':
|
||||
password => $swift_user_password,
|
||||
|
@ -565,7 +565,10 @@ class ha_controller (
|
||||
nova_rate_limits => $nova_rate_limits,
|
||||
cinder_rate_limits => $cinder_rate_limits,
|
||||
horizon_use_ssl => $horizon_use_ssl,
|
||||
ha_provider => $ha_provider
|
||||
ha_provider => $ha_provider,
|
||||
internal_virtual_ip_mask => '24',
|
||||
public_virtual_ip_mask => '24',
|
||||
keepalived_vrrp_script => "killall -0 haproxy"
|
||||
}
|
||||
class { 'swift::keystone::auth':
|
||||
password => $swift_user_password,
|
||||
|
@ -502,7 +502,10 @@ class compact_controller (
|
||||
nova_rate_limits => $nova_rate_limits,
|
||||
cinder_rate_limits => $cinder_rate_limits,
|
||||
horizon_use_ssl => $horizon_use_ssl,
|
||||
ha_provider => $ha_provider
|
||||
ha_provider => $ha_provider,
|
||||
internal_virtual_ip_mask => '24',
|
||||
public_virtual_ip_mask => '24',
|
||||
keepalived_vrrp_script => "killall -0 haproxy"
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -108,6 +108,9 @@ class openstack::controller_ha (
|
||||
$create_networks = true,
|
||||
$use_unicast_corosync = false,
|
||||
$ha_mode = true,
|
||||
$internal_virtual_ip_mask = undef,
|
||||
$public_virtual_ip_mask = undef,
|
||||
$keepalived_vrrp_script = "killall -0 haproxy",
|
||||
) {
|
||||
|
||||
# haproxy
|
||||
@ -240,15 +243,19 @@ local0.* -/var/log/haproxy.log'
|
||||
|
||||
keepalived::instance { $public_vrid:
|
||||
interface => $public_interface,
|
||||
virtual_ips => [$public_virtual_ip],
|
||||
virtual_ips => $public_virtual_ip_mask ? { undef => ["${public_virtual_ip}"], default => ["${public_virtual_ip}/${public_virtual_ip_mask}"] },
|
||||
state => $primary_controller ? { true => 'MASTER', default => 'BACKUP' },
|
||||
priority => $primary_controller ? { true => 101, default => 100 },
|
||||
priority => $primary_controller ? { true => 100, default => fqdn_rand(100) },
|
||||
vrrp_script => $keepalived_vrrp_script,
|
||||
weight => 101,
|
||||
}
|
||||
keepalived::instance { $internal_vrid:
|
||||
interface => $internal_interface,
|
||||
virtual_ips => [$internal_virtual_ip],
|
||||
virtual_ips => $internal_virtual_ip_mask ? { undef => ["${internal_virtual_ip}"], default => ["${internal_virtual_ip}/${internal_virtual_ip_mask}"] },
|
||||
state => $primary_controller ? { true => 'MASTER', default => 'BACKUP' },
|
||||
priority => $primary_controller ? { true => 101, default => 100 },
|
||||
priority => $primary_controller ? { true => 100, default => fqdn_rand(100) },
|
||||
vrrp_script => $keepalived_vrrp_script,
|
||||
weight => 101,
|
||||
}
|
||||
|
||||
class { '::openstack::firewall':
|
||||
|
Loading…
Reference in New Issue
Block a user