From 4d9531f32f5718d3dcdf9fb3c92ac95142d2feb8 Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <mmosesohn@mirantis.com>
Date: Fri, 18 Mar 2016 17:30:54 +0300
Subject: [PATCH] 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
---
 deployment_scripts/database_hiera_override.pp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/deployment_scripts/database_hiera_override.pp b/deployment_scripts/database_hiera_override.pp
index 293ba7b..7d1f4c7 100644
--- a/deployment_scripts/database_hiera_override.pp
+++ b/deployment_scripts/database_hiera_override.pp
@@ -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 %>
 ')