openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
This commit is contained in:
Marios Andreou 2019-01-04 14:09:44 +02:00
parent 6a81b393c9
commit cf70e57351
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ci/environments/scenario004-standalone.yaml
View File

@ -1,4 +1,9 @@
resource_registry: 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::CephMgr: ../../docker/services/ceph-ansible/ceph-mgr.yaml
OS::TripleO::Services::CephMon: ../../docker/services/ceph-ansible/ceph-mon.yaml OS::TripleO::Services::CephMon: ../../docker/services/ceph-ansible/ceph-mon.yaml
OS::TripleO::Services::CephOSD: ../../docker/services/ceph-ansible/ceph-osd.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::Pacemaker: ../../puppet/services/pacemaker.yaml
OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
OS::TripleO::Services::Clustercheck: ../../docker/services/pacemaker/clustercheck.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::MySQL: ../../docker/services/pacemaker/database/mysql.yaml
OS::TripleO::Services::Keepalived: OS::Heat::None 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 # 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 # 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, # will implement default connection to overcloud RabbitMQ instance,
@ -61,11 +63,8 @@ parameter_defaults:
ManilaCephFSDataPoolPGNum: 16 ManilaCephFSDataPoolPGNum: 16
ManilaCephFSMetadataPoolPGNum: 16 ManilaCephFSMetadataPoolPGNum: 16
NovaEnableRbdBackend: true NovaEnableRbdBackend: true
CinderEnableRbdBackend: true
CinderBackupBackend: ceph
GlanceBackend: rbd GlanceBackend: rbd
GnocchiBackend: rbd GnocchiBackend: rbd
CinderEnableIscsiBackend: false
GnocchiArchivePolicy: 'high' GnocchiArchivePolicy: 'high'
BannerText: | BannerText: |
****************************************************************** ******************************************************************