From ab0111eeb267f6a4e4bea8921965562f0a0e880c Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 1 Feb 2017 15:54:52 -0500 Subject: [PATCH] Revert "scenario004: disable watcher" This reverts commit 591f3c7c1f610659e179254be04b5caca140ff21. Change-Id: I918b9590b2d13aa04a7367de663db0bd2058a064 --- README.md | 1 + fixtures/scenario004.pp | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 12aec9e4b..d79369438 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,7 @@ 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 d16b002c9..aa3c67de9 100644 --- a/fixtures/scenario004.pp +++ b/fixtures/scenario004.pp @@ -23,9 +23,7 @@ if $::operatingsystem == 'Ubuntu' { } else { $ssl_enabled = true $ipv6 = true - # Re-enable Watcher when monascaclient is packaged in RDO and - # added to Watcher dependencies. - $watcher_enabled = false + $watcher_enabled = true } include ::openstack_integration