From cf70e57351338ca01929cdeb7aef7029cc86f566 Mon Sep 17 00:00:00 2001
From: Marios Andreou <marios@redhat.com>
Date: Fri, 4 Jan 2019 14:09:44 +0200
Subject: [PATCH] Fix scenario004-standalone - remove
 cinder/fluentd/horizon/redis

As tracked in [1] the scenario4 standalone is carrying some
extra services compared to the multinode it replaces.

This disables cinder, fluentd, horizon and redis for scenario4

[1] https://tree.taiga.io/project/tripleo-ci-board/task/541

Change-Id: Ia6fbe2fe7392f25cc11276e2a9e17f4e5d6df1f1
---
 ci/environments/scenario004-standalone.yaml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/ci/environments/scenario004-standalone.yaml b/ci/environments/scenario004-standalone.yaml
index 80a54f9cb6..7100f40782 100644
--- a/ci/environments/scenario004-standalone.yaml
+++ b/ci/environments/scenario004-standalone.yaml
@@ -1,4 +1,9 @@
 resource_registry:
+  OS::TripleO::Services::CinderApi: OS::Heat::None
+  OS::TripleO::Services::CinderScheduler: OS::Heat::None
+  OS::TripleO::Services::CinderVolume: OS::Heat::None
+  OS::TripleO::Services::Redis: OS::Heat::None
+  OS::TripleO::Services::Horizon: OS::Heat::None
   OS::TripleO::Services::CephMgr: ../../docker/services/ceph-ansible/ceph-mgr.yaml
   OS::TripleO::Services::CephMon: ../../docker/services/ceph-ansible/ceph-mon.yaml
   OS::TripleO::Services::CephOSD: ../../docker/services/ceph-ansible/ceph-osd.yaml
@@ -18,11 +23,8 @@ resource_registry:
   OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
   OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
   OS::TripleO::Services::Clustercheck: ../../docker/services/pacemaker/clustercheck.yaml
-  OS::TripleO::Services::Redis: ../../docker/services/pacemaker/database/redis.yaml
   OS::TripleO::Services::MySQL: ../../docker/services/pacemaker/database/mysql.yaml
   OS::TripleO::Services::Keepalived: OS::Heat::None
-  #Needs to run scenario001
-  OS::TripleO::Services::Fluentd: ../../docker/services/fluentd.yaml
   # NOTE(mmagr): We need to disable Sensu client deployment for now as the container health check is based
   #  on successful RabbitMQ connection, which does not happen in this case. We can enable it again when we
   #  will implement default connection to overcloud RabbitMQ instance,
@@ -61,11 +63,8 @@ parameter_defaults:
   ManilaCephFSDataPoolPGNum: 16
   ManilaCephFSMetadataPoolPGNum: 16
   NovaEnableRbdBackend: true
-  CinderEnableRbdBackend: true
-  CinderBackupBackend: ceph
   GlanceBackend: rbd
   GnocchiBackend: rbd
-  CinderEnableIscsiBackend: false
   GnocchiArchivePolicy: 'high'
   BannerText: |
     ******************************************************************