openstack/fuel-library
Code Issues Proposed changes

Merge "Rename VIP resources"

Browse Source
This commit is contained in:
Jenkins 2014-10-17 10:05:49 +00:00 committed by Gerrit Code Review
commit 598f2b7212
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/puppet/cluster/manifests/haproxy_ocf.pp
View File

@ -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}"
],
}

4
deployment/puppet/mysql/manifests/server.pp
View File

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

4
deployment/puppet/osnailyfacter/manifests/cluster_ha.pp
View File

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