From 36ef9a841c33be941b3aa16d7eb3ce0c68dff1a8 Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <mmosesohn@mirantis.com>
Date: Thu, 17 Mar 2016 17:28:57 +0300
Subject: [PATCH] Disable haproxy VIP colocation for keystone role

Change-Id: If7de248adda2637132d4bf9dc9d6d1aec20f091d
Closes-Bug: #1556052
---
 deployment_scripts/hiera-override.pp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/deployment_scripts/hiera-override.pp b/deployment_scripts/hiera-override.pp
index f35918b..2f1e381 100644
--- a/deployment_scripts/hiera-override.pp
+++ b/deployment_scripts/hiera-override.pp
@@ -54,6 +54,7 @@ if $detach_keystone_plugin {
     /keystone/: {
       $corosync_roles      = $keystone_roles
       $corosync_nodes      = $keystone_nodes
+      $haproxy_colocate    = 'false'
       $memcache_roles      = $keystone_roles
       $memcache_nodes      = $keystone_nodes
       $memcached_addresses = ipsort(values(get_node_to_ipaddr_map_by_network_role($keystone_nodes,'mgmt/memcache')))
@@ -121,6 +122,9 @@ corosync_roles:
 %>  - <%= crole %>
 <% end -%>
 <% end -%>
+<% if @haproxy_colocate -%>
+haproxy_colocate: <%= @haproxy_colocate %>
+<% end -%>
 <% if @memcache_nodes -%>
 <% require "yaml" -%>
 memcache_nodes: