Merge "Rename VIP resources"
This commit is contained in:
commit
598f2b7212
@ -56,7 +56,7 @@ class cluster::haproxy_ocf (
|
||||
ensure => present,
|
||||
score => 'INFINITY',
|
||||
primitives => [
|
||||
"vip__public_old",
|
||||
"vip__public",
|
||||
"clone_${service_name}"
|
||||
],
|
||||
}
|
||||
@ -64,7 +64,7 @@ class cluster::haproxy_ocf (
|
||||
ensure => present,
|
||||
score => 'INFINITY',
|
||||
primitives => [
|
||||
"vip__management_old",
|
||||
"vip__management",
|
||||
"clone_${service_name}"
|
||||
],
|
||||
}
|
||||
|
@ -206,9 +206,9 @@ class mysql::server (
|
||||
provider => 'pacemaker',
|
||||
}
|
||||
|
||||
#Tie vip__management_old to p_mysqld
|
||||
#Tie vip__management to p_mysqld
|
||||
cs_colocation { 'mysql_to_internal-vip':
|
||||
primitives => ['vip__management_old',"master_p_${service_name}:Master"],
|
||||
primitives => ['vip__management',"master_p_${service_name}:Master"],
|
||||
score => 'INFINITY',
|
||||
require => [Cs_resource["p_${service_name}"], Cs_commit['mysql']],
|
||||
}
|
||||
|
@ -143,7 +143,7 @@ class osnailyfacter::cluster_ha {
|
||||
$vip_public_cidr_netmask = netmask_to_cidr($primary_controller_nodes[0]['public_netmask'])
|
||||
|
||||
$vips = { # Do not convert to ARRAY, It can't work in 2.7
|
||||
management_old => {
|
||||
management => {
|
||||
namespace => 'haproxy',
|
||||
nic => $::internal_int,
|
||||
base_veth => "${::internal_int}-hapr",
|
||||
@ -161,7 +161,7 @@ class osnailyfacter::cluster_ha {
|
||||
}
|
||||
|
||||
if $::public_int {
|
||||
$vips[public_old] = {
|
||||
$vips[public] = {
|
||||
namespace => 'haproxy',
|
||||
nic => $::public_int,
|
||||
base_veth => "${::public_int}-hapr",
|
||||
|
Loading…
Reference in New Issue
Block a user