From de4f67b4b09839115a7f7d2e608e5e6e72b33fa7 Mon Sep 17 00:00:00 2001
From: Simon Pasquier <spasquier@mirantis.com>
Date: Tue, 10 Jan 2017 15:07:08 +0100
Subject: [PATCH] Prevent co-installation with the Contrail plugin

Change-Id: I0ae666b0cef666c387a9b15d6ed71bfa3e75235c
Closes-Bug: #1646550
---
 node_roles.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/node_roles.yaml b/node_roles.yaml
index bba0c6f..a96edaa 100644
--- a/node_roles.yaml
+++ b/node_roles.yaml
@@ -13,6 +13,13 @@ elasticsearch_kibana:
     - compute
     - cinder
     - ceph-osd
+    # The Contraill plugin ships a HAProxy package version that isn't
+    # compatible with the MOS version
+    # See https://bugs.launchpad.net/fuel/+bug/1646550
+    - contrail-controller
+    - contrail-analytics
+    - contrail-analytics-db
+    - contrail-tsn
   # 'update_required' is needed to make sure that the already deployed nodes
   # are updated in the same run as the new nodes. The 'reexecute_on' stanza
   # doesn't guarantee this since the reexecuted tasks are run after the new