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 %>
 ')