Disable haproxy VIP colocation for database role

Database role doesn't run management or public VIPs,
so it cannot colocate haproxy with these VIP resources
in corosync.

Change-Id: I38cd4982bb81c77f7ec05c3fbeab699af26102d1
Partial-Bug: #1556052
This commit is contained in:
Matthew Mosesohn 2016-03-18 17:30:54 +03:00
parent 3e3a0b0360
commit 4d9531f32f
1 changed files with 4 additions and 1 deletions

View File

@ -47,13 +47,13 @@ if $detach_database_plugin {
}
}
#TODO(mattymo): debug needing corosync_roles
case hiera('role', 'none') {
/database/: {
$corosync_roles = $database_roles
$deploy_vrouter = false
$mysql_enabled = true
$corosync_nodes = $database_nodes
$colocate_haproxy = 'false'
}
/controller/: {
$mysql_enabled = false
@ -99,6 +99,9 @@ corosync_roles:
%> - <%= crole %>
<% end -%>
<% end -%>
<% if @colocate_haproxy -%>
colocate_haproxy: <%= @colocate_haproxy %>
<% end -%>
deploy_vrouter: <%= @deploy_vrouter %>
')