From 397b2f0f838b3f0d0dcfeb9634ceb91dd04b5df7 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Wed, 19 Jul 2017 18:26:02 -0700
Subject: [PATCH] Disable watcher and murano temporarily

Looks like it's broken again, let's disable it so we can get promotion
in weirdo and unblock scenario003 which is still blocked by murano
tempest plugin patch.

This reverts commit 66929dc85611fd988cbceef851421c0b55649f52.

Change-Id: I1a5a818e138c7ad553554fef2fc339074bc0d435
---
 fixtures/scenario003.pp | 3 ++-
 fixtures/scenario004.pp | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fixtures/scenario003.pp b/fixtures/scenario003.pp
index b7148dace..80df8e459 100644
--- a/fixtures/scenario003.pp
+++ b/fixtures/scenario003.pp
@@ -29,7 +29,8 @@ case $::osfamily {
   'RedHat': {
     $ipv6            = true
     $mistral_enabled = true
-    $murano_enabled  = true
+    # re-enable next time we have RDO promotion
+    $murano_enabled  = false
     $sahara_enabled  = true
     $trove_enabled   = true
   }
diff --git a/fixtures/scenario004.pp b/fixtures/scenario004.pp
index 9e643d321..cf4b879dc 100644
--- a/fixtures/scenario004.pp
+++ b/fixtures/scenario004.pp
@@ -25,7 +25,9 @@ if $::operatingsystem == 'Ubuntu' {
 } else {
   $ssl_enabled     = true
   $ipv6            = true
-  $watcher_enabled = true
+  # TODO(aschultz): enable once https://review.rdoproject.org/r/#/c/6491/ is
+  # promoted
+  $watcher_enabled = false
   $bgpvpn_enabled = true
 }