openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove fluentd from scenarios"

This commit is contained in:
Zuul 2019-08-28 23:47:13 +00:00 committed by Gerrit Code Review
parent 8975c5795b 7cfcd698bd
commit bae35832aa
4 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ci/environments/scenario001-multinode-containers.yaml
View File

@ -21,7 +21,6 @@ resource_registry:
OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-pacemaker-puppet.yaml
OS::TripleO::Services::Keepalived: OS::Heat::None
#Needs to run scenario001
OS::TripleO::Services::Fluentd: ../../deployment/deprecated/logging/fluentd-container-puppet.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,

1
ci/environments/scenario001-standalone.yaml
View File

@ -27,7 +27,6 @@ resource_registry:
OS::TripleO::Services::CinderBackup: ../../deployment/cinder/cinder-backup-container-puppet.yaml
OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-container-puppet.yaml
#Needs to run scenario001
OS::TripleO::Services::Fluentd: ../../deployment/deprecated/logging/fluentd-container-puppet.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,

1
ci/environments/scenario002-multinode-containers.yaml
View File

@ -20,7 +20,6 @@ resource_registry:
# Some infra instances don't pass the ping test but are otherwise working.
# Since the OVB jobs also test this functionality we can shut it off here.
OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml
OS::TripleO::Services::Fluentd: ../../deployment/deprecated/logging/fluentd-container-puppet.yaml
parameter_defaults:
ControllerServices:

1
ci/environments/scenario002-standalone.yaml
View File

@ -26,7 +26,6 @@ resource_registry:
# Some infra instances don't pass the ping test but are otherwise working.
# Since the OVB jobs also test this functionality we can shut it off here.
OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml
OS::TripleO::Services::Fluentd: ../../deployment/deprecated/logging/fluentd-container-puppet.yaml
OS::TripleO::Services::Horizon: OS::Heat::None
parameter_defaults: