From 70946dc9a92778e36ee60e4e82e5c1f6059b3ba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= Date: Tue, 10 Dec 2019 13:49:30 +0100 Subject: [PATCH] Install tmpwatch on the overcloud For some reason, it wasn't active on the overcloud nodes. Change-Id: I11bf31dc5e367fb317e5d1d3ae8cccdca64c66c9 Closes-Bug: #1855802 (cherry picked from commit 0419a5b8e6682238418b3bd004d00b815b9a1c45) (cherry picked from commit 80be9b8f0f78fe196ace03a67fe9ccd3da893b1c) --- deployment/logrotate/tmpwatch-install.yaml | 4 ++-- overcloud-resource-registry-puppet.j2.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment/logrotate/tmpwatch-install.yaml b/deployment/logrotate/tmpwatch-install.yaml index 97ada068e8..12716606c8 100644 --- a/deployment/logrotate/tmpwatch-install.yaml +++ b/deployment/logrotate/tmpwatch-install.yaml @@ -1,7 +1,7 @@ heat_template_version: rocky description: > - Install tmpwatch on the undercloud/standalone + Install tmpwatch parameters: EndpointMap: @@ -33,7 +33,7 @@ parameters: outputs: role_data: - description: Role data for tmpwatch install on undercloud or standalone + description: Role data for tmpwatch install value: service_name: logrotate_tmpwatch deploy_steps_tasks: diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 56ab77a667..6ca178fe8c 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -343,7 +343,7 @@ resource_registry: OS::TripleO::Services::Multipathd: deployment/multipathd/multipathd-container.yaml # 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::GlanceApi: deployment/glance/glance-api-logging-file-container.yaml OS::TripleO::Services::Logging::HAProxy: deployment/logging/files/haproxy.yaml