Merge "Install tmpwatch on the overcloud" into stable/stein

This commit is contained in:
Zuul 2019-12-19 21:08:17 +00:00 committed by Gerrit Code Review
commit 4c907fa121
2 changed files with 3 additions and 3 deletions

View File

@ -1,7 +1,7 @@
heat_template_version: rocky heat_template_version: rocky
description: > description: >
Install tmpwatch on the undercloud/standalone Install tmpwatch
parameters: parameters:
EndpointMap: EndpointMap:
@ -33,7 +33,7 @@ parameters:
outputs: outputs:
role_data: role_data:
description: Role data for tmpwatch install on undercloud or standalone description: Role data for tmpwatch install
value: value:
service_name: logrotate_tmpwatch service_name: logrotate_tmpwatch
deploy_steps_tasks: deploy_steps_tasks:

View File

@ -343,7 +343,7 @@ resource_registry:
OS::TripleO::Services::Multipathd: deployment/multipathd/multipathd-container.yaml OS::TripleO::Services::Multipathd: deployment/multipathd/multipathd-container.yaml
# Logging # Logging
OS::TripleO::Services::Tmpwatch: OS::Heat::None OS::TripleO::Services::Tmpwatch: deployment/logrotate/tmpwatch-install.yaml
OS::TripleO::Services::Logging::BarbicanApi: deployment/logging/files/barbican-api.yaml OS::TripleO::Services::Logging::BarbicanApi: deployment/logging/files/barbican-api.yaml
OS::TripleO::Services::Logging::GlanceApi: deployment/glance/glance-api-logging-file-container.yaml OS::TripleO::Services::Logging::GlanceApi: deployment/glance/glance-api-logging-file-container.yaml
OS::TripleO::Services::Logging::HAProxy: deployment/logging/files/haproxy.yaml OS::TripleO::Services::Logging::HAProxy: deployment/logging/files/haproxy.yaml