From 591f3c7c1f610659e179254be04b5caca140ff21 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Mon, 16 Jan 2017 13:41:48 -0500
Subject: [PATCH] scenario004: disable watcher

Watcher introduced a new dependency with:
https://github.com/openstack/watcher/commit/a015af1bd2d672c7c0b68a3e617d7391fa889164

But RDO doesn't have any package for Monasca yet.
Let's disable Watcher until packages are built in RDO and dependencies
are fixed.

Change-Id: I321e7830aa3a94e23dac422470ba98a63a666fab
---
 README.md               | 1 -
 fixtures/scenario004.pp | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 09f666cbf..142df1f73 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,6 @@ scenario](#all-in-one).
 | ceph       |      X      |             |             |      X      |              |
 | ceph rgw   |             |             |             |      X      |              |
 | mongodb    |             |       X     |             |             |              |
-| watcher    |             |             |             |      X      |              |
 
 When the Jenkins slave is created, the *run_tests.sh* script will executed.
 This script will execute *install_modules.sh* that prepare /etc/puppet/modules
diff --git a/fixtures/scenario004.pp b/fixtures/scenario004.pp
index aa3c67de9..d16b002c9 100644
--- a/fixtures/scenario004.pp
+++ b/fixtures/scenario004.pp
@@ -23,7 +23,9 @@ if $::operatingsystem == 'Ubuntu' {
 } else {
   $ssl_enabled     = true
   $ipv6            = true
-  $watcher_enabled = true
+  # Re-enable Watcher when monascaclient is packaged in RDO and
+  # added to Watcher dependencies.
+  $watcher_enabled = false
 }
 
 include ::openstack_integration